diff --git a/utils/tex2rtf/src/Makefile.in b/utils/tex2rtf/src/Makefile.in
index 7412061688..15b1aa9658 100644
--- a/utils/tex2rtf/src/Makefile.in
+++ b/utils/tex2rtf/src/Makefile.in
@@ -114,8 +114,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_4 = -d __WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_5 = --define __WXUNIVERSAL__
+@COND_USE_GUI_1@__install_tex2rtf_gui___depname = install_tex2rtf_gui
@COND_PLATFORM_MAC_1@__tex2rtf___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL tex2rtf$(EXEEXT)
+@COND_USE_GUI_1@__tex2rtf_gui___depname = tex2rtf_gui$(EXEEXT)
@COND_PLATFORM_MAC_1@__tex2rtf_gui___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__tex2rtf_gui___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C tex2rtf_gui$(EXEEXT)
@@ -129,7 +131,7 @@ COND_PLATFORM_OS2_1___tex2rtf_gui___os2_emxbindcmd = $(NM) \
### Targets: ###
-all: tex2rtf$(EXEEXT) tex2rtf_gui$(EXEEXT)
+all: tex2rtf$(EXEEXT) $(__tex2rtf_gui___depname)
clean:
rm -rf ./.deps ./.pch
@@ -140,7 +142,7 @@ clean:
distclean: clean
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-install: all install_tex2rtf install_tex2rtf_gui
+install: all install_tex2rtf $(__install_tex2rtf_gui___depname)
install-strip: install
$(STRIP) $(DESTDIR)$(bindir)/tex2rtf$(EXEEXT)
@@ -150,20 +152,20 @@ install_tex2rtf:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) tex2rtf$(EXEEXT) $(DESTDIR)$(bindir)
-install_tex2rtf_gui:
- $(INSTALL_DIR) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) tex2rtf_gui$(EXEEXT) $(DESTDIR)$(bindir)
+@COND_USE_GUI_1@install_tex2rtf_gui:
+@COND_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+@COND_USE_GUI_1@ $(INSTALL_PROGRAM) tex2rtf_gui$(EXEEXT) $(DESTDIR)$(bindir)
tex2rtf$(EXEEXT): $(TEX2RTF_OBJECTS)
$(CXX) -o $@ $(TEX2RTF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS)
$(__tex2rtf___mac_setfilecmd)
-tex2rtf_gui$(EXEEXT): $(TEX2RTF_GUI_OBJECTS) $(__tex2rtf_gui___win32rc)
- $(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
- $(__tex2rtf_gui___mac_rezcmd)
- $(__tex2rtf_gui___mac_setfilecmd)
- $(__tex2rtf_gui___os2_emxbindcmd)
+@COND_USE_GUI_1@tex2rtf_gui$(EXEEXT): $(TEX2RTF_GUI_OBJECTS) $(__tex2rtf_gui___win32rc)
+@COND_USE_GUI_1@ $(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_USE_GUI_1@ $(__tex2rtf_gui___mac_rezcmd)
+@COND_USE_GUI_1@ $(__tex2rtf_gui___mac_setfilecmd)
+@COND_USE_GUI_1@ $(__tex2rtf_gui___os2_emxbindcmd)
tex2rtf_gui_htmlutil.o: $(srcdir)/htmlutil.cpp
$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
diff --git a/utils/tex2rtf/src/makefile.bcc b/utils/tex2rtf/src/makefile.bcc
index c1d1216f59..16864bdbae 100644
--- a/utils/tex2rtf/src/makefile.bcc
+++ b/utils/tex2rtf/src/makefile.bcc
@@ -167,6 +167,9 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__
!endif
+!if "$(USE_GUI)" == "1"
+__tex2rtf_gui___depname = $(OBJS)\tex2rtf_gui.exe
+!endif
all: $(OBJS)
@@ -175,7 +178,7 @@ $(OBJS):
### Targets: ###
-all: $(OBJS)\tex2rtf.exe $(OBJS)\tex2rtf_gui.exe
+all: $(OBJS)\tex2rtf.exe $(__tex2rtf_gui___depname)
$(OBJS)\tex2rtf_gui_htmlutil.obj: .\htmlutil.cpp
$(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
@@ -249,7 +252,9 @@ $(OBJS)\tex2rtf.exe: $(TEX2RTF_OBJECTS)
c0x32.obj $(TEX2RTF_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,,
|
+!if "$(USE_GUI)" == "1"
$(OBJS)\tex2rtf_gui.exe: $(TEX2RTF_GUI_OBJECTS) $(OBJS)\tex2rtf_gui_sample.res
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
c0w32.obj $(TEX2RTF_GUI_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\tex2rtf_gui_sample.res
|
+!endif
diff --git a/utils/tex2rtf/src/makefile.gcc b/utils/tex2rtf/src/makefile.gcc
index 1d6ccb95a3..18983e819a 100644
--- a/utils/tex2rtf/src/makefile.gcc
+++ b/utils/tex2rtf/src/makefile.gcc
@@ -175,6 +175,9 @@ endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__
endif
+ifeq ($(USE_GUI),1)
+__tex2rtf_gui___depname = $(OBJS)\tex2rtf_gui.exe
+endif
all: $(OBJS)
@@ -183,7 +186,7 @@ $(OBJS):
### Targets: ###
-all: $(OBJS)\tex2rtf.exe $(OBJS)\tex2rtf_gui.exe
+all: $(OBJS)\tex2rtf.exe $(__tex2rtf_gui___depname)
$(OBJS)\tex2rtf_gui_htmlutil.o: ./htmlutil.cpp
$(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
@@ -244,7 +247,9 @@ clean:
$(OBJS)\tex2rtf.exe: $(TEX2RTF_OBJECTS)
$(CXX) -o $@ $(TEX2RTF_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+ifeq ($(USE_GUI),1)
$(OBJS)\tex2rtf_gui.exe: $(TEX2RTF_GUI_OBJECTS) $(OBJS)\tex2rtf_gui_sample_rc.o
$(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+endif
.PHONY: all clean
diff --git a/utils/tex2rtf/src/makefile.vc b/utils/tex2rtf/src/makefile.vc
index 38155f5bef..432620c285 100644
--- a/utils/tex2rtf/src/makefile.vc
+++ b/utils/tex2rtf/src/makefile.vc
@@ -275,6 +275,9 @@ ____DEBUGRUNTIME_2_p = /D_DEBUG
!if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
!endif
+!if "$(USE_GUI)" == "1"
+__tex2rtf_gui___depname = $(OBJS)\tex2rtf_gui.exe
+!endif
all: $(OBJS)
@@ -283,7 +286,7 @@ $(OBJS):
### Targets: ###
-all: $(OBJS)\tex2rtf.exe $(OBJS)\tex2rtf_gui.exe
+all: $(OBJS)\tex2rtf.exe $(__tex2rtf_gui___depname)
$(OBJS)\tex2rtf_gui_htmlutil.obj: .\htmlutil.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEX2RTF_GUI_CXXFLAGS) $**
@@ -351,7 +354,9 @@ $(OBJS)\tex2rtf.exe: $(TEX2RTF_OBJECTS)
$(TEX2RTF_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib
<<
+!if "$(USE_GUI)" == "1"
$(OBJS)\tex2rtf_gui.exe: $(TEX2RTF_GUI_OBJECTS) $(OBJS)\tex2rtf_gui_sample.res
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
$(TEX2RTF_GUI_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib
<<
+!endif
diff --git a/utils/tex2rtf/src/makefile.wat b/utils/tex2rtf/src/makefile.wat
index 3775d5a437..31e1c81939 100644
--- a/utils/tex2rtf/src/makefile.wat
+++ b/utils/tex2rtf/src/makefile.wat
@@ -169,6 +169,10 @@ __WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!endif
+__tex2rtf_gui___depname =
+!ifeq USE_GUI 1
+__tex2rtf_gui___depname = $(OBJS)\tex2rtf_gui.exe
+!endif
### Variables: ###
@@ -210,7 +214,7 @@ $(OBJS) :
### Targets: ###
-all : .SYMBOLIC $(OBJS)\tex2rtf.exe $(OBJS)\tex2rtf_gui.exe
+all : .SYMBOLIC $(OBJS)\tex2rtf.exe $(__tex2rtf_gui___depname)
$(OBJS)\tex2rtf_gui_htmlutil.obj : .AUTODEPEND .\htmlutil.cpp
$(CXX) -zq -fo=$^@ $(TEX2RTF_GUI_CXXFLAGS) $<
@@ -282,6 +286,7 @@ $(OBJS)\tex2rtf.exe : $(TEX2RTF_OBJECTS)
@%append $(OBJS)\tex2rtf.lbc
wlink @$(OBJS)\tex2rtf.lbc
+!ifeq USE_GUI 1
$(OBJS)\tex2rtf_gui.exe : $(TEX2RTF_GUI_OBJECTS) $(OBJS)\tex2rtf_gui_sample.res
@%create $(OBJS)\tex2rtf_gui.lbc
@%append $(OBJS)\tex2rtf_gui.lbc option quiet
@@ -292,3 +297,4 @@ $(OBJS)\tex2rtf_gui.exe : $(TEX2RTF_GUI_OBJECTS) $(OBJS)\tex2rtf_gui_sample.res
@for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\tex2rtf_gui.lbc library %i
@%append $(OBJS)\tex2rtf_gui.lbc option resource=$(OBJS)\tex2rtf_gui_sample.res
wlink @$(OBJS)\tex2rtf_gui.lbc
+!endif
diff --git a/utils/tex2rtf/src/tex2rtf.bkl b/utils/tex2rtf/src/tex2rtf.bkl
index dcd88b28ff..ab953032ae 100644
--- a/utils/tex2rtf/src/tex2rtf.bkl
+++ b/utils/tex2rtf/src/tex2rtf.bkl
@@ -24,7 +24,8 @@
$(BINDIR)
-
+
$(TEX2RTF_SRC)
html
core