]> git.saurik.com Git - wxWidgets.git/blobdiff - utils/tex2rtf/src/Makefile.in
Finally removes occurences of OnMenuCommand and closes bug #1164678
[wxWidgets.git] / utils / tex2rtf / src / Makefile.in
index d209d6b1fe3872bd52fdb4aa57ce3330157d8bfa..5b6e4b8601adbe9df7e137d3aa4806cc4ef6e3d1 100644 (file)
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXEEXT = @EXEEXT@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-EXTRALIBS_HTML = @EXTRALIBS_HTML@
-HOST_SUFFIX = @HOST_SUFFIX@
-INSTALL_DIR = @INSTALL_DIR@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-NM = @NM@
 RESCOMP = @RESCOMP@
 SETFILE = @SETFILE@
 STRIP = @STRIP@
 RESCOMP = @RESCOMP@
 SETFILE = @SETFILE@
 STRIP = @STRIP@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+NM = @NM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DIR = @INSTALL_DIR@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+bindir = @bindir@
+LDFLAGS_GUI = @LDFLAGS_GUI@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-bindir = @bindir@
-srcdir = @srcdir@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+HOST_SUFFIX = @HOST_SUFFIX@
 
 ### Variables: ###
 
 DESTDIR = 
 
 ### Variables: ###
 
 DESTDIR = 
+WX_RELEASE = 2.7
 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib
-TEX2RTF_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) -DNO_GUI $(CXXFLAGS)
-TEX2RTF_GUI_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples $(CXXFLAGS)
+TEX2RTF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 -DNO_GUI $(CPPFLAGS) $(CXXFLAGS)
+TEX2RTF_OBJECTS =  \
+       tex2rtf_tex2rtf.o \
+       tex2rtf_tex2any.o \
+       tex2rtf_texutils.o \
+       tex2rtf_rtfutils.o \
+       tex2rtf_xlputils.o \
+       tex2rtf_htmlutil.o \
+       tex2rtf_readshg.o \
+       tex2rtf_table.o
+TEX2RTF_GUI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
+       $(CXXFLAGS)
 TEX2RTF_GUI_OBJECTS =  \
        $(__tex2rtf_gui___win32rc) \
        $(__tex2rtf_gui_os2_lib_res) \
 TEX2RTF_GUI_OBJECTS =  \
        $(__tex2rtf_gui___win32rc) \
        $(__tex2rtf_gui_os2_lib_res) \
@@ -55,15 +67,6 @@ TEX2RTF_GUI_OBJECTS =  \
        tex2rtf_gui_htmlutil.o \
        tex2rtf_gui_readshg.o \
        tex2rtf_gui_table.o
        tex2rtf_gui_htmlutil.o \
        tex2rtf_gui_readshg.o \
        tex2rtf_gui_table.o
-TEX2RTF_OBJECTS =  \
-       tex2rtf_tex2rtf.o \
-       tex2rtf_tex2any.o \
-       tex2rtf_texutils.o \
-       tex2rtf_rtfutils.o \
-       tex2rtf_xlputils.o \
-       tex2rtf_htmlutil.o \
-       tex2rtf_readshg.o \
-       tex2rtf_table.o
 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 
@@ -76,52 +79,26 @@ TEX2RTF_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_4 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_5 = --define WXUSINGDLL
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) -i $(top_srcdir)/include -i $(srcdir) \
-       $(__DLLFLAG_p_4) -i $(srcdir)/../../../samples -o tex2rtf_gui$(EXEEXT) \
-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(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_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_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___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)
 @COND_PLATFORM_MAC_1@__tex2rtf_gui___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C tex2rtf_gui$(EXEEXT)
+@COND_PLATFORM_MAC_1@__tex2rtf_gui___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_4 = -d __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_5 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_4 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_5 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_4 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_5 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_4 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_5 = --define wxNO_THREADS
+@COND_SHARED_1@__DLLFLAG_p_4 = -d WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_5 = --define WXUSINGDLL
 COND_PLATFORM_OS2_1___tex2rtf_gui___os2_emxbindcmd = $(NM) \
        tex2rtf_gui$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
        tex2rtf_gui$(EXEEXT) ; fi
 COND_PLATFORM_OS2_1___tex2rtf_gui___os2_emxbindcmd = $(NM) \
        tex2rtf_gui$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
        tex2rtf_gui$(EXEEXT) ; fi
@@ -129,11 +106,61 @@ COND_PLATFORM_OS2_1___tex2rtf_gui___os2_emxbindcmd = $(NM) \
 @COND_PLATFORM_WIN32_1@__tex2rtf_gui___win32rc = tex2rtf_gui_sample_rc.o
 @COND_PLATFORM_OS2_1@__tex2rtf_gui_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_WIN32_1@__tex2rtf_gui___win32rc = tex2rtf_gui_sample_rc.o
 @COND_PLATFORM_OS2_1@__tex2rtf_gui_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+@COND_USE_GUI_1@__install_tex2rtf_gui___depname = install_tex2rtf_gui
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) $(__EXCEPTIONS_DEFINE_p_4) \
+       $(__RTTI_DEFINE_p_4) $(__THREAD_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \
+       $(srcdir)/../../../samples -i $(top_srcdir)/include -o tex2rtf_gui$(EXEEXT) \
+       Carbon.r sample.r
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
+@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
+@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+       -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 
 ### Targets: ###
 
 all: tex2rtf$(EXEEXT) $(__tex2rtf_gui___depname)
 
 
 ### Targets: ###
 
 all: tex2rtf$(EXEEXT) $(__tex2rtf_gui___depname)
 
+install: all install_tex2rtf $(__install_tex2rtf_gui___depname)
+
+uninstall: 
+
+install-strip: install
+       $(STRIP) $(DESTDIR)$(bindir)/tex2rtf$(EXEEXT)
+       $(STRIP) $(DESTDIR)$(bindir)/tex2rtf_gui$(EXEEXT)
+
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
@@ -141,88 +168,80 @@ clean:
        rm -f tex2rtf_gui$(EXEEXT)
 
 distclean: clean
        rm -f tex2rtf_gui$(EXEEXT)
 
 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___depname)
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 
-install-strip: install
-       $(STRIP) $(DESTDIR)$(bindir)/tex2rtf$(EXEEXT)
-       $(STRIP) $(DESTDIR)$(bindir)/tex2rtf_gui$(EXEEXT)
+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_FOR_BASE)
+       
+       $(__tex2rtf___mac_setfilecmd)
 
 install_tex2rtf: 
        $(INSTALL_DIR) $(DESTDIR)$(bindir)
        $(INSTALL_PROGRAM) tex2rtf$(EXEEXT) $(DESTDIR)$(bindir)
 
 
 install_tex2rtf: 
        $(INSTALL_DIR) $(DESTDIR)$(bindir)
        $(INSTALL_PROGRAM) tex2rtf$(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)
-
 @COND_USE_GUI_1@tex2rtf_gui$(EXEEXT): $(TEX2RTF_GUI_OBJECTS) $(__tex2rtf_gui___win32rc)
 @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) $(EXTRALIBS_HTML) $(__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@       $(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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_FOR_BASE) $(EXTRALIBS_FOR_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)
 
 @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) $<
+@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_gui_readshg.o: $(srcdir)/readshg.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+tex2rtf_tex2rtf.o: $(srcdir)/tex2rtf.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/tex2rtf.cpp
 
 
-tex2rtf_gui_rtfutils.o: $(srcdir)/rtfutils.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+tex2rtf_tex2any.o: $(srcdir)/tex2any.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/tex2any.cpp
 
 
-tex2rtf_gui_sample_rc.o: $(srcdir)/../../../samples/sample.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../../../samples
+tex2rtf_texutils.o: $(srcdir)/texutils.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/texutils.cpp
 
 
-tex2rtf_gui_table.o: $(srcdir)/table.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+tex2rtf_rtfutils.o: $(srcdir)/rtfutils.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/rtfutils.cpp
 
 
-tex2rtf_gui_tex2any.o: $(srcdir)/tex2any.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+tex2rtf_xlputils.o: $(srcdir)/xlputils.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/xlputils.cpp
 
 
-tex2rtf_gui_tex2rtf.o: $(srcdir)/tex2rtf.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+tex2rtf_htmlutil.o: $(srcdir)/htmlutil.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/htmlutil.cpp
 
 
-tex2rtf_gui_texutils.o: $(srcdir)/texutils.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+tex2rtf_readshg.o: $(srcdir)/readshg.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/readshg.cpp
 
 
-tex2rtf_gui_xlputils.o: $(srcdir)/xlputils.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+tex2rtf_table.o: $(srcdir)/table.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/table.cpp
 
 
-tex2rtf_htmlutil.o: $(srcdir)/htmlutil.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+tex2rtf_gui_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5)  $(__EXCEPTIONS_DEFINE_p_5) $(__RTTI_DEFINE_p_5) $(__THREAD_DEFINE_p_5)   --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../../../samples --include-dir $(top_srcdir)/include
 
 
-tex2rtf_readshg.o: $(srcdir)/readshg.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+tex2rtf_gui_tex2rtf.o: $(srcdir)/tex2rtf.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/tex2rtf.cpp
 
 
-tex2rtf_rtfutils.o: $(srcdir)/rtfutils.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+tex2rtf_gui_tex2any.o: $(srcdir)/tex2any.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/tex2any.cpp
 
 
-tex2rtf_table.o: $(srcdir)/table.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+tex2rtf_gui_texutils.o: $(srcdir)/texutils.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/texutils.cpp
 
 
-tex2rtf_tex2any.o: $(srcdir)/tex2any.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+tex2rtf_gui_rtfutils.o: $(srcdir)/rtfutils.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/rtfutils.cpp
 
 
-tex2rtf_tex2rtf.o: $(srcdir)/tex2rtf.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+tex2rtf_gui_xlputils.o: $(srcdir)/xlputils.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/xlputils.cpp
 
 
-tex2rtf_texutils.o: $(srcdir)/texutils.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+tex2rtf_gui_htmlutil.o: $(srcdir)/htmlutil.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/htmlutil.cpp
 
 
-tex2rtf_xlputils.o: $(srcdir)/xlputils.cpp
-       $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+tex2rtf_gui_readshg.o: $(srcdir)/readshg.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/readshg.cpp
 
 
-uninstall: 
+tex2rtf_gui_table.o: $(srcdir)/table.cpp
+       $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/table.cpp
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install install_tex2rtf install_tex2rtf_gui uninstall
+.PHONY: all install uninstall clean distclean install_tex2rtf install_tex2rtf_gui