Finally removes occurences of OnMenuCommand and closes bug #1164678

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

diff --git a/utils/tex2rtf/src/makefile.gcc b/utils/tex2rtf/src/makefile.gcc
index 47c16afaf991b957f5b4bfeca7600ffff545d3c5..8e2c2f3f7eaa4bb7bede94a89ffd700887b1ea06 100644 (file)
--- a/utils/tex2rtf/src/makefile.gcc
+++ b/utils/tex2rtf/src/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.4 (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!
 # =========================================================================
 


@@ -12,15 +12,20 @@ include ../../../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
+CPPDEPS = -MT$@ -MF$@.d -MD
+WX_RELEASE_NODOT = 27

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

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

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

-TEX2RTF_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
-       -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -DNO_GUI \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
+TEX2RTF_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       -I.\..\..\..\include -I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
+       -DNO_GUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)

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


@@ -30,11 +35,13 @@ TEX2RTF_OBJECTS =  \
        $(OBJS)\tex2rtf_htmlutil.o \
        $(OBJS)\tex2rtf_readshg.o \
        $(OBJS)\tex2rtf_table.o
        $(OBJS)\tex2rtf_htmlutil.o \
        $(OBJS)\tex2rtf_readshg.o \
        $(OBJS)\tex2rtf_table.o

-TEX2RTF_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \
-       $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
+TEX2RTF_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       -I.\..\..\..\include -I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) \
+       -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)

 TEX2RTF_GUI_OBJECTS =  \
        $(OBJS)\tex2rtf_gui_sample_rc.o \
        $(OBJS)\tex2rtf_gui_tex2rtf.o \
 TEX2RTF_GUI_OBJECTS =  \
        $(OBJS)\tex2rtf_gui_sample_rc.o \
        $(OBJS)\tex2rtf_gui_tex2rtf.o \


@@ -74,6 +81,18 @@ endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif

+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif

 ifeq ($(USE_GUI),1)
 __tex2rtf_gui___depname = $(OBJS)\tex2rtf_gui.exe
 endif
 ifeq ($(USE_GUI),1)
 __tex2rtf_gui___depname = $(OBJS)\tex2rtf_gui.exe
 endif


@@ -88,9 +107,21 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p_3 = --define __WXDEBUG__
 endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p_3 = --define __WXDEBUG__
 endif

+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_3 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_3 = --define wxNO_THREADS
+endif

 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_3 = --define _UNICODE
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_3 = --define _UNICODE
 endif

+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_3 = --define wxUSE_UNICODE_MSLU=1
+endif

 ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif


@@ -108,17 +139,17 @@ endif
 ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif

-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-rtti
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti

 endif
 endif

-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG = 

 endif
 ifeq ($(USE_EXCEPTIONS),0)
 endif
 ifeq ($(USE_EXCEPTIONS),0)

-__EXCEPTIONSFLAG_0 = -fno-exceptions
+__EXCEPTIONSFLAG = -fno-exceptions

 endif
 ifeq ($(USE_EXCEPTIONS),1)
 endif
 ifeq ($(USE_EXCEPTIONS),1)

-__EXCEPTIONSFLAG_0 = 
+__EXCEPTIONSFLAG = 

 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__


@@ -131,14 +162,20 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif

+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif

 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif

-ifeq ($(SHARED),0)
-LIBDIRNAME = .\..\..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = .\..\..\..\lib\gcc_dll$(CFG)
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1

 endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL


@@ -179,6 +216,12 @@ endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif

+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif

 
 
 all: $(OBJS)
 
 
 all: $(OBJS)


@@ -191,66 +234,71 @@ all: $(OBJS)\tex2rtf.exe $(__tex2rtf_gui___depname)
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o

+       -if exist $(OBJS)\*.d del $(OBJS)\*.d

        -if exist $(OBJS)\tex2rtf.exe del $(OBJS)\tex2rtf.exe
        -if exist $(OBJS)\tex2rtf_gui.exe del $(OBJS)\tex2rtf_gui.exe
 
 $(OBJS)\tex2rtf.exe: $(TEX2RTF_OBJECTS)
        -if exist $(OBJS)\tex2rtf.exe del $(OBJS)\tex2rtf.exe
        -if exist $(OBJS)\tex2rtf_gui.exe del $(OBJS)\tex2rtf_gui.exe
 
 $(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$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+       $(CXX) -o $@ $(TEX2RTF_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)   $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32

 
 ifeq ($(USE_GUI),1)
 $(OBJS)\tex2rtf_gui.exe: $(TEX2RTF_GUI_OBJECTS) $(OBJS)\tex2rtf_gui_sample_rc.o
 
 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$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+       $(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -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$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32

 endif
 
 $(OBJS)\tex2rtf_tex2rtf.o: ./tex2rtf.cpp
 endif
 
 $(OBJS)\tex2rtf_tex2rtf.o: ./tex2rtf.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_tex2any.o: ./tex2any.cpp
 
 $(OBJS)\tex2rtf_tex2any.o: ./tex2any.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_texutils.o: ./texutils.cpp
 
 $(OBJS)\tex2rtf_texutils.o: ./texutils.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_rtfutils.o: ./rtfutils.cpp
 
 $(OBJS)\tex2rtf_rtfutils.o: ./rtfutils.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_xlputils.o: ./xlputils.cpp
 
 $(OBJS)\tex2rtf_xlputils.o: ./xlputils.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_htmlutil.o: ./htmlutil.cpp
 
 $(OBJS)\tex2rtf_htmlutil.o: ./htmlutil.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_readshg.o: ./readshg.cpp
 
 $(OBJS)\tex2rtf_readshg.o: ./readshg.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_table.o: ./table.cpp
 
 $(OBJS)\tex2rtf_table.o: ./table.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_gui_sample_rc.o: ./../../../samples/sample.rc
 
 $(OBJS)\tex2rtf_gui_sample_rc.o: ./../../../samples/sample.rc

-       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../../samples
+       windres --use-temp-file -i$< -o$@   --define __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) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../../samples

 
 $(OBJS)\tex2rtf_gui_tex2rtf.o: ./tex2rtf.cpp
 
 $(OBJS)\tex2rtf_gui_tex2rtf.o: ./tex2rtf.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_gui_tex2any.o: ./tex2any.cpp
 
 $(OBJS)\tex2rtf_gui_tex2any.o: ./tex2any.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_gui_texutils.o: ./texutils.cpp
 
 $(OBJS)\tex2rtf_gui_texutils.o: ./texutils.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_gui_rtfutils.o: ./rtfutils.cpp
 
 $(OBJS)\tex2rtf_gui_rtfutils.o: ./rtfutils.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_gui_xlputils.o: ./xlputils.cpp
 
 $(OBJS)\tex2rtf_gui_xlputils.o: ./xlputils.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_gui_htmlutil.o: ./htmlutil.cpp
 
 $(OBJS)\tex2rtf_gui_htmlutil.o: ./htmlutil.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_gui_readshg.o: ./readshg.cpp
 
 $(OBJS)\tex2rtf_gui_readshg.o: ./readshg.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(CPPDEPS) $<

 
 $(OBJS)\tex2rtf_gui_table.o: ./table.cpp
 
 $(OBJS)\tex2rtf_gui_table.o: ./table.cpp

-       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(CPPDEPS) $<

 
 .PHONY: all clean
 
 .PHONY: all clean

+
+
+# Dependencies tracking:
+-include $(OBJS)/*.d