minor fix (no real effect)

[wxWidgets.git] / utils / HelpGen / Makefile.in

diff --git a/utils/HelpGen/Makefile.in b/utils/HelpGen/Makefile.in
index d41e0cf2a9c8fbe75eb9fbabcac0b491673d23fc..53c3224d7984dc55279fb6d974c64efbeda10492 100644 (file)
--- a/utils/HelpGen/Makefile.in
+++ b/utils/HelpGen/Makefile.in
@@ -13,7 +13,6 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
@@ -28,9 +27,7 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 HELPGEN_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
+       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
 HELPGEN_OBJECTS =  \
        HelpGen_HelpGen.o \
        HelpGen_cjparser.o \
@@ -39,14 +36,11 @@ HELPGEN_OBJECTS =  \
        HelpGen_markup.o \
        HelpGen_scriptbinder.o \
        HelpGen_sourcepainter.o \
-       HelpGen_srcparser.o \
-       HelpGen_wx_extra_imps.o
+       HelpGen_srcparser.o
 LIBDIRNAME = $(top_builddir)lib
 
 ### Conditionally set variables: ###
 
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -56,14 +50,7 @@ LIBDIRNAME = $(top_builddir)lib
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_PLATFORM_MAC_1@__HelpGen___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL HelpGen$(EXEEXT)
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL HelpGen
 @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 \
@@ -90,44 +77,41 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 
 ### Targets: ###
 
-all: HelpGen$(EXEEXT)
+all: HelpGen
 
-HelpGen$(EXEEXT): $(HELPGEN_OBJECTS)
+HelpGen: $(HELPGEN_OBJECTS)
        $(CXX) -o $@ $(HELPGEN_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)
        
        $(__HelpGen___mac_setfilecmd)
 
 HelpGen_HelpGen.o: $(srcdir)/src/HelpGen.cpp
-       $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
 
 HelpGen_cjparser.o: $(srcdir)/src/cjparser.cpp
-       $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
 
 HelpGen_docripper.o: $(srcdir)/src/docripper.cpp
-       $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
 
 HelpGen_ifcontext.o: $(srcdir)/src/ifcontext.cpp
-       $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
 
 HelpGen_markup.o: $(srcdir)/src/markup.cpp
-       $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
 
 HelpGen_scriptbinder.o: $(srcdir)/src/scriptbinder.cpp
-       $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
 
 HelpGen_sourcepainter.o: $(srcdir)/src/sourcepainter.cpp
-       $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
 
 HelpGen_srcparser.o: $(srcdir)/src/srcparser.cpp
-       $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
-
-HelpGen_wx_extra_imps.o: $(srcdir)/src/wx_extra_imps.cpp
-       $(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f HelpGen$(EXEEXT)
+       rm -f HelpGen
 
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile