added src to the HelpGen directory

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/Makefile.in b/utils/Makefile.in
index a349c710e685d08aacb94a9b826aae5824b2b8b3..c11568822877c9cc7057047bd4444f04c74211be 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -34,14 +34,14 @@ clean:
        (cd emulator/src && $(MAKE) clean)
        (cd helpview/src && $(MAKE) clean)
        (cd tex2rtf/src && $(MAKE) clean)
-       (cd HelpGen && $(MAKE) clean)
+       (cd HelpGen/src && $(MAKE) clean)
 
 distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
        (cd emulator/src && $(MAKE) distclean)
        (cd helpview/src && $(MAKE) distclean)
        (cd tex2rtf/src && $(MAKE) distclean)
-       (cd HelpGen && $(MAKE) distclean)
+       (cd HelpGen/src && $(MAKE) distclean)
 
 emulator: 
        (cd emulator/src && $(MAKE) all)
@@ -62,16 +62,16 @@ install-strip_tex2rtf:
        (cd tex2rtf/src && $(MAKE) install-strip)
 
 helpgen: 
-       (cd HelpGen && $(MAKE) all)
+       (cd HelpGen/src && $(MAKE) all)
 
 install_helpgen: 
-       (cd HelpGen && $(MAKE) install)
+       (cd HelpGen/src && $(MAKE) install)
 
 uninstall_helpgen: 
-       (cd HelpGen && $(MAKE) uninstall)
+       (cd HelpGen/src && $(MAKE) uninstall)
 
 install-strip_helpgen: 
-       (cd HelpGen && $(MAKE) install-strip)
+       (cd HelpGen/src && $(MAKE) install-strip)
 
 
 # Include dependency info, if present:

diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 8bf563e2dcbb2d60e92acb649c34c2e85c6cf5a9..f91b0697513dd34675b1f3113d27ccafe6dd8239 100644 (file)
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -29,7 +29,8 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
        -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
        -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
        -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
-       -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" \
+       -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
        -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
        -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
        -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
@@ -61,7 +62,7 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>tex2rtf.bat
        call tex2rtf.bat
        @del tex2rtf.bat
-       @echo cd HelpGen >helpgen.bat
+       @echo cd HelpGen\src >helpgen.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpgen.bat
        call helpgen.bat
        @del helpgen.bat
@@ -85,7 +86,7 @@ tex2rtf:
        @del tex2rtf.bat
 
 helpgen: 
-       @echo cd HelpGen >helpgen.bat
+       @echo cd HelpGen\src >helpgen.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpgen.bat
        call helpgen.bat
        @del helpgen.bat

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 83804d68256b4a8bdc8ed3fd083ac5df2c6214c0..ffa21a57bad0f262ea4d6e39f3d64b5bd381bc85 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -18,8 +18,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" \
-       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
@@ -41,7 +41,7 @@ clean:
        $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) clean
-       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C HelpGen\src -f makefile.gcc $(MAKEARGS) clean
 
 emulator: 
        $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
@@ -53,7 +53,7 @@ tex2rtf:
        $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) all
 
 helpgen: 
-       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
+       $(MAKE) -C HelpGen\src -f makefile.gcc $(MAKEARGS) all
 
 .PHONY: all clean emulator helpview tex2rtf helpgen
 

diff --git a/utils/makefile.vc b/utils/makefile.vc
index f40e5661f9c92e22054e552dd34c7b90b87fb808..b0a5d657c328c0b42f30450790745990d3f0ae3c 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -19,8 +19,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" \
-       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
@@ -42,34 +42,34 @@ clean:
        -if exist .\*.pch del .\*.pch
        cd emulator\src
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
        cd helpview\src
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
        cd tex2rtf\src
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
-       cd $(MAKEDIR)
-       cd HelpGen
+       cd "$(MAKEDIR)"
+       cd HelpGen\src
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
 
 sub_emulator: 
        cd emulator\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
 
 sub_helpview: 
        cd helpview\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
 
 sub_tex2rtf: 
        cd tex2rtf\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
 
 sub_helpgen: 
-       cd HelpGen
+       cd HelpGen\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
+       cd "$(MAKEDIR)"
 

diff --git a/utils/makefile.wat b/utils/makefile.wat
index d9c75fb7adf05744b11e77abab5bc136283b5d46..f94e88407791d8bbb49e03fa24488d16419a2284 100644 (file)
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -36,8 +36,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" &
-       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
+       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
@@ -65,7 +65,7 @@ clean : .SYMBOLIC
        cd tex2rtf\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
-       cd HelpGen
+       cd HelpGen\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
 
@@ -85,7 +85,7 @@ tex2rtf : .SYMBOLIC
        cd $(WATCOM_CWD)
 
 helpgen : .SYMBOLIC 
-       cd HelpGen
+       cd HelpGen\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 

diff --git a/utils/utils.bkl b/utils/utils.bkl
index 1a48eff3f6a97434d6a0ee5689926af8b95d7d38..3852b27404879fd0f63b401318bc3ef9d3a66264 100644 (file)
--- a/utils/utils.bkl
+++ b/utils/utils.bkl
@@ -2,7 +2,7 @@
 <makefile>
 
     <include file="../build/bakefiles/config.bkl"/>
-    
+
     <template id="sub">
         <dependency-of>all</dependency-of>
     </template>
@@ -11,19 +11,19 @@
         <dir>emulator/src</dir>
         <installable>no</installable>
     </subproject>
-    
+
     <subproject id="helpview" template="sub">
         <dir>helpview/src</dir>
         <installable>no</installable>
     </subproject>
-    
+
     <subproject id="tex2rtf" template="sub">
         <dir>tex2rtf/src</dir>
         <installable>yes</installable>
     </subproject>
-    
+
     <subproject id="helpgen" template="sub">
-        <dir>HelpGen</dir>
+        <dir>HelpGen/src</dir>
         <installable>yes</installable>
     </subproject>