Don't create uneeded variables.

[wxWidgets.git] / utils / HelpGen / makefile.bcc

diff --git a/utils/HelpGen/makefile.bcc b/utils/HelpGen/makefile.bcc
index 1abd3c1ff84f7b3ebd18c4945f36c109995a8b62..3f62df1ccc7c8eeb69564da78600608f0aa3386f 100644 (file)
--- a/utils/HelpGen/makefile.bcc
+++ b/utils/HelpGen/makefile.bcc
@@ -20,11 +20,10 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(LIBDIRNAME) \
-       -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \
-       -I.\..\..\src\regex -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
+HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
+       $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
+       -I. $(__DLLFLAG_p) $(CXXFLAGS)
 HELPGEN_OBJECTS =  \
        $(OBJS)\HelpGen_HelpGen.obj \
        $(OBJS)\HelpGen_cjparser.obj \
@@ -33,15 +32,20 @@ HELPGEN_OBJECTS =  \
        $(OBJS)\HelpGen_markup.obj \
        $(OBJS)\HelpGen_scriptbinder.obj \
        $(OBJS)\HelpGen_sourcepainter.obj \
-       $(OBJS)\HelpGen_srcparser.obj \
-       $(OBJS)\HelpGen_wx_extra_imps.obj
-LIBDIRNAME = \
-       .\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+       $(OBJS)\HelpGen_srcparser.obj
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### 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
@@ -112,7 +116,7 @@ __RUNTIME_LIBS_7 = i
 __RUNTIME_LIBS_7 = 
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
@@ -161,15 +165,17 @@ $(OBJS)\HelpGen_sourcepainter.obj: .\src\sourcepainter.cpp
 $(OBJS)\HelpGen_srcparser.obj: .\src\srcparser.cpp
        $(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
 
-$(OBJS)\HelpGen_wx_extra_imps.obj: .\src\wx_extra_imps.cpp
-       $(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
-
 $(OBJS)\HelpGen.exe: $(HELPGEN_OBJECTS)
-       ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
-       c0x32.obj $(HELPGEN_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_7).lib,,
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
+       c0x32.obj $(HELPGEN_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 import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
 |
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\HelpGen.exe del $(OBJS)\HelpGen.exe
+       -if exist $(OBJS)\HelpGen.tds del $(OBJS)\HelpGen.tds
+       -if exist $(OBJS)\HelpGen.ilc del $(OBJS)\HelpGen.ilc
+       -if exist $(OBJS)\HelpGen.ild del $(OBJS)\HelpGen.ild
+       -if exist $(OBJS)\HelpGen.ilf del $(OBJS)\HelpGen.ilf
+       -if exist $(OBJS)\HelpGen.ils del $(OBJS)\HelpGen.ils