Added SWIG patches to allow compiling the generated code with

[wxWidgets.git] / utils / tex2rtf / src / makefile.bcc

diff --git a/utils/tex2rtf/src/makefile.bcc b/utils/tex2rtf/src/makefile.bcc
index 82d08565572887578d4e0d993db9d49c2333e55d..af53c2c1a13e212a02128ef49138ddc849457f3f 100644 (file)
--- a/utils/tex2rtf/src/makefile.bcc
+++ b/utils/tex2rtf/src/makefile.bcc
@@ -1,10 +1,15 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

+.autodepend
+

 !ifndef BCCDIR
 !ifndef BCCDIR

+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif

 BCCDIR = $(MAKEDIR)\..
 !endif
 
 BCCDIR = $(MAKEDIR)\..
 !endif
 


@@ -14,33 +19,20 @@ BCCDIR = $(MAKEDIR)\..
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 

-!if "$(BCCDIR)" == "\.."
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-

 ### Variables: ###
 
 ### Variables: ###
 

+WX_RELEASE_NODOT = 27

 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-TEX2RTF_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
-       -DNO_GUI $(CXXFLAGS)
-TEX2RTF_GUI_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
-       -I.\..\..\..\samples $(CXXFLAGS)
-TEX2RTF_GUI_OBJECTS =  \
-       $(OBJS)\tex2rtf_gui_tex2rtf.obj \
-       $(OBJS)\tex2rtf_gui_tex2any.obj \
-       $(OBJS)\tex2rtf_gui_texutils.obj \
-       $(OBJS)\tex2rtf_gui_rtfutils.obj \
-       $(OBJS)\tex2rtf_gui_xlputils.obj \
-       $(OBJS)\tex2rtf_gui_htmlutil.obj \
-       $(OBJS)\tex2rtf_gui_readshg.obj \
-       $(OBJS)\tex2rtf_gui_table.obj
+TEX2RTF_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 -DNO_GUI \
+       $(CPPFLAGS) $(CXXFLAGS)

 TEX2RTF_OBJECTS =  \
        $(OBJS)\tex2rtf_tex2rtf.obj \
        $(OBJS)\tex2rtf_tex2any.obj \
 TEX2RTF_OBJECTS =  \
        $(OBJS)\tex2rtf_tex2rtf.obj \
        $(OBJS)\tex2rtf_tex2any.obj \


@@ -50,15 +42,24 @@ TEX2RTF_OBJECTS =  \
        $(OBJS)\tex2rtf_htmlutil.obj \
        $(OBJS)\tex2rtf_readshg.obj \
        $(OBJS)\tex2rtf_table.obj
        $(OBJS)\tex2rtf_htmlutil.obj \
        $(OBJS)\tex2rtf_readshg.obj \
        $(OBJS)\tex2rtf_table.obj

+TEX2RTF_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) -I.\..\..\..\samples \
+       -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+TEX2RTF_GUI_OBJECTS =  \
+       $(OBJS)\tex2rtf_gui_tex2rtf.obj \
+       $(OBJS)\tex2rtf_gui_tex2any.obj \
+       $(OBJS)\tex2rtf_gui_texutils.obj \
+       $(OBJS)\tex2rtf_gui_rtfutils.obj \
+       $(OBJS)\tex2rtf_gui_xlputils.obj \
+       $(OBJS)\tex2rtf_gui_htmlutil.obj \
+       $(OBJS)\tex2rtf_gui_readshg.obj \
+       $(OBJS)\tex2rtf_gui_table.obj

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-!if "$(SHARED)" == "0"
-LIBDIRNAME = .\..\..\..\lib\bcc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = .\..\..\..\lib\bcc_dll$(CFG)
-!endif

 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif


@@ -71,32 +72,32 @@ WXDEBUGFLAG = d
 !if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif

-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif

 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll

 !endif
 !endif

-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 

 !endif
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  

 !endif
 !endif

-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+!if "$(USE_GUI)" == "1"
+__tex2rtf_gui___depname = $(OBJS)\tex2rtf_gui.exe
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
 __DEBUG_DEFINE_p_3 = -d__WXDEBUG__
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
 __DEBUG_DEFINE_p_3 = -d__WXDEBUG__


@@ -104,20 +105,31 @@ __DEBUG_DEFINE_p_3 = -d__WXDEBUG__
 !if "$(DEBUG_FLAG)" == "1"
 __DEBUG_DEFINE_p_3 = -d__WXDEBUG__
 !endif
 !if "$(DEBUG_FLAG)" == "1"
 __DEBUG_DEFINE_p_3 = -d__WXDEBUG__
 !endif

-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_3 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_3 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_3 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_3 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_3 = -dwxUSE_UNICODE_MSLU=1

 !endif
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_3 = -dWXUSINGDLL
 !endif
 !endif
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_3 = -dWXUSINGDLL
 !endif

-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib

 !endif
 !endif

-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib

 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = -Od
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = -Od


@@ -125,6 +137,18 @@ __OPTIMIZEFLAG = -Od
 !if "$(BUILD)" == "release"
 __OPTIMIZEFLAG = -O2
 !endif
 !if "$(BUILD)" == "release"
 __OPTIMIZEFLAG = -O2
 !endif

+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_0 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_0 = -tWM
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS = -tWR
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS = -tWR
 !endif


@@ -137,35 +161,64 @@ __RUNTIME_LIBS_0 = i
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_0 = 
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_0 = 
 !endif

-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS

 !endif
 !if "$(UNICODE)" == "1"
 !endif
 !if "$(UNICODE)" == "1"

-__UNICODE_DEFINE_p_3 = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE

 !endif
 !if "$(MSLU)" == "1"
 !endif
 !if "$(MSLU)" == "1"

-__UNICOWS_LIB_p = unicows.lib
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1

 !endif
 !endif

-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL

 !endif
 !if "$(MONOLITHIC)" == "0"
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_HTML_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \

-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v

 !endif
 
 
 !endif
 
 


@@ -175,34 +228,51 @@ $(OBJS):
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: $(OBJS)\tex2rtf.exe $(OBJS)\tex2rtf_gui.exe
-
-$(OBJS)\tex2rtf_gui_htmlutil.obj: .\htmlutil.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+all: $(OBJS)\tex2rtf.exe $(__tex2rtf_gui___depname)

 
 

-$(OBJS)\tex2rtf_gui_readshg.obj: .\readshg.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+       -if exist $(OBJS)\tex2rtf.exe del $(OBJS)\tex2rtf.exe
+       -if exist $(OBJS)\tex2rtf.tds del $(OBJS)\tex2rtf.tds
+       -if exist $(OBJS)\tex2rtf.ilc del $(OBJS)\tex2rtf.ilc
+       -if exist $(OBJS)\tex2rtf.ild del $(OBJS)\tex2rtf.ild
+       -if exist $(OBJS)\tex2rtf.ilf del $(OBJS)\tex2rtf.ilf
+       -if exist $(OBJS)\tex2rtf.ils del $(OBJS)\tex2rtf.ils
+       -if exist $(OBJS)\tex2rtf_gui.exe del $(OBJS)\tex2rtf_gui.exe
+       -if exist $(OBJS)\tex2rtf_gui.tds del $(OBJS)\tex2rtf_gui.tds
+       -if exist $(OBJS)\tex2rtf_gui.ilc del $(OBJS)\tex2rtf_gui.ilc
+       -if exist $(OBJS)\tex2rtf_gui.ild del $(OBJS)\tex2rtf_gui.ild
+       -if exist $(OBJS)\tex2rtf_gui.ilf del $(OBJS)\tex2rtf_gui.ilf
+       -if exist $(OBJS)\tex2rtf_gui.ils del $(OBJS)\tex2rtf_gui.ils

 
 

-$(OBJS)\tex2rtf_gui_rtfutils.obj: .\rtfutils.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+$(OBJS)\tex2rtf.exe: $(TEX2RTF_OBJECTS)
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
+       c0x32.obj $(TEX2RTF_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,
+|

 
 

-$(OBJS)\tex2rtf_gui_sample.res: .\..\..\..\samples\sample.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_3) -i.\..\..\..\samples $**
+!if "$(USE_GUI)" == "1"
+$(OBJS)\tex2rtf_gui.exe: $(TEX2RTF_GUI_OBJECTS)  $(OBJS)\tex2rtf_gui_sample.res
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\tex2rtf_gui_sample.res
+|
+!endif

 
 

-$(OBJS)\tex2rtf_gui_table.obj: .\table.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+$(OBJS)\tex2rtf_tex2rtf.obj: .\tex2rtf.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**

 
 

-$(OBJS)\tex2rtf_gui_tex2any.obj: .\tex2any.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+$(OBJS)\tex2rtf_tex2any.obj: .\tex2any.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**

 
 

-$(OBJS)\tex2rtf_gui_tex2rtf.obj: .\tex2rtf.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+$(OBJS)\tex2rtf_texutils.obj: .\texutils.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**

 
 

-$(OBJS)\tex2rtf_gui_texutils.obj: .\texutils.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+$(OBJS)\tex2rtf_rtfutils.obj: .\rtfutils.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**

 
 

-$(OBJS)\tex2rtf_gui_xlputils.obj: .\xlputils.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+$(OBJS)\tex2rtf_xlputils.obj: .\xlputils.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**

 
 $(OBJS)\tex2rtf_htmlutil.obj: .\htmlutil.cpp
        $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
 
 $(OBJS)\tex2rtf_htmlutil.obj: .\htmlutil.cpp
        $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**


@@ -210,36 +280,33 @@ $(OBJS)\tex2rtf_htmlutil.obj: .\htmlutil.cpp
 $(OBJS)\tex2rtf_readshg.obj: .\readshg.cpp
        $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
 
 $(OBJS)\tex2rtf_readshg.obj: .\readshg.cpp
        $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
 

-$(OBJS)\tex2rtf_rtfutils.obj: .\rtfutils.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
-

 $(OBJS)\tex2rtf_table.obj: .\table.cpp
        $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
 
 $(OBJS)\tex2rtf_table.obj: .\table.cpp
        $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
 

-$(OBJS)\tex2rtf_tex2any.obj: .\tex2any.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
+$(OBJS)\tex2rtf_gui_sample.res: .\..\..\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_3) -i.\..\..\..\samples $**

 
 

-$(OBJS)\tex2rtf_tex2rtf.obj: .\tex2rtf.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
+$(OBJS)\tex2rtf_gui_tex2rtf.obj: .\tex2rtf.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**

 
 

-$(OBJS)\tex2rtf_texutils.obj: .\texutils.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
+$(OBJS)\tex2rtf_gui_tex2any.obj: .\tex2any.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**

 
 

-$(OBJS)\tex2rtf_xlputils.obj: .\xlputils.cpp
-       $(CXX) -q -c -P -o$@ $(TEX2RTF_CXXFLAGS) $**
+$(OBJS)\tex2rtf_gui_texutils.obj: .\texutils.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**

 
 

-clean: 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\tex2rtf.exe del $(OBJS)\tex2rtf.exe
-       -if exist $(OBJS)\tex2rtf_gui.exe del $(OBJS)\tex2rtf_gui.exe
+$(OBJS)\tex2rtf_gui_rtfutils.obj: .\rtfutils.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**

 
 

-$(OBJS)\tex2rtf.exe: $(TEX2RTF_OBJECTS)
-       ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
-       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) import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_0).lib,,
-|
+$(OBJS)\tex2rtf_gui_xlputils.obj: .\xlputils.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+
+$(OBJS)\tex2rtf_gui_htmlutil.obj: .\htmlutil.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+
+$(OBJS)\tex2rtf_gui_readshg.obj: .\readshg.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
+
+$(OBJS)\tex2rtf_gui_table.obj: .\table.cpp
+       $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**

 
 

-$(OBJS)\tex2rtf_gui.exe: $(TEX2RTF_GUI_OBJECTS)  $(OBJS)\tex2rtf_gui_sample.res
-       ilink32 -Tpe -q $(LDFLAGS) $(__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) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\tex2rtf_gui_sample.res
-|