makefile changes for utils_dist

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

diff --git a/Makefile.in b/Makefile.in
index 22f231760c6297dd9a7d6ce70c9fd399b3a9196e..0a5252a5ca3161df45f5a5c98d4b683a6cc898b1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1088,6 +1088,24 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
     
 UTILS_DIST: ALL_GUI_DIST
+       mkdir $(DISTDIR)/utils
+       cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+       cp $(UTILSDIR)/configure $(DISTDIR)/utils
+       cp $(UTILSDIR)/configure.in $(DISTDIR)/utils
+
+       mkdir $(DISTDIR)/utils/tex2rtf
+       mkdir $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
+       cp $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
+       cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
+
+       mkdir $(DISTDIR)/utils/makegen
+       mkdir $(DISTDIR)/utils/makegen/templates
+       cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen
+       cp $(UTILSDIR)/makegen/*.cpp $(DISTDIR)/utils/makegen
+       cp $(UTILSDIR)/makegen/templates/*.* $(DISTDIR)/utils/makegen/templates
 
 MISC_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/misc
@@ -1106,15 +1124,6 @@ MANUAL_DIST:
        cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
        cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
 
-       -mkdir $(DISTDIR)/utils
-       mkdir $(DISTDIR)/utils/tex2rtf
-       mkdir $(DISTDIR)/utils/tex2rtf/src
-       cp $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
-       cp $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
-       cp $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
-       cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
-       cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
-
 # this target does not generate a complete wxPython dist, it only includes
 # those files needed for the Debian source package.
 # see utils/wxPython/distrib for scripts to make a proper wxPython dist.

diff --git a/utils/Makefile.in b/utils/Makefile.in
index d7c108504a1a162781c56e61b04246503bf08190..141bfa23da3b84700131be3bee37e42c96989f4f 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -2,19 +2,11 @@
 # Makefile : Builds wxWindows utils for Unix.
 #
 
+UTILS_SUBDIRS=tex2rtf hhp2cached makegen HelpGen dialoged
+
 all:
-       cd tex2rtf; make
-       cd hhp2cached; make
-       cd makegen; make
-       cd HelpGen; make
-       cd dialoged; make
-       cd wxMMedia2; make
+       @for d in $(UTILS_SUBDIRS); do (cd $$d && $(MAKE)); done
 
 clean:
-       cd tex2rtf; make clean
-       cd hhp2cached; make clean
-       cd makegen; make clean
-       cd HelpGen; make clean
-       cd dialoged; make clean
-       cd wxMMedia2; make clean
+       @for d in $(UTILS_SUBDIRS); do (cd $$d && $(MAKE) clean); done