X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8869c3a1cefb93bb602e141f447902a056dcc448..32ceccf56fa2c1a7f580ca92dfe74e8e0ec6217c:/build/bakefiles/make_dist.mk?ds=sidebyside diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 9c31ef2e07..d5ef370a37 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -5,7 +5,7 @@ ############################# Dirs ################################# -WXDIR = @abs_top_srcdir@ +WXDIR = $(top_srcdir) # Subordinate library possibilities @@ -22,6 +22,7 @@ ZLIBDIR = $(WXDIR)/src/zlib REGEXDIR = $(WXDIR)/src/regex EXPATDIR = $(WXDIR)/src/expat GTKDIR = $(WXDIR)/src/gtk +GTK1DIR = $(WXDIR)/src/gtk1 X11DIR = $(WXDIR)/src/x11 X11INC = $(WXDIR)/include/wx/x11 MGLDIR = $(WXDIR)/src/mgl @@ -63,8 +64,8 @@ DISTDIR=./_dist_dir/$(DISTDIRNAME) ########################## Tools ############################### -CP_PR = @LNDIR@ -CP_P = $(LN_S) -f +CP_PR = cp -pR +CP_P = cp -p ########################## make dist rules ############################### @@ -77,6 +78,7 @@ ALL_DIST: distrib_clean $(CP_P) $(WXDIR)/configure $(DISTDIR) $(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR) $(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR) + $(CP_P) $(WXDIR)/acinclude.m4 $(DISTDIR) $(CP_P) $(WXDIR)/aclocal.m4 $(DISTDIR) $(CP_P) $(WXDIR)/config.sub $(DISTDIR) $(CP_P) $(WXDIR)/config.guess $(DISTDIR) @@ -114,7 +116,6 @@ ALL_DIST: distrib_clean $(CP_P) $(REGEXDIR)/*.c $(DISTDIR)/src/regex $(CP_P) $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex $(CP_P) $(REGEXDIR)/README $(DISTDIR)/src/regex - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/src/expat; esac $(CP_PR) $(EXPATDIR) $(DISTDIR)/src/expat #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`) mkdir $(DISTDIR)/src/iodbc @@ -274,7 +275,7 @@ BASE_DIST: ALL_DIST $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src -GTK_DIST: ALL_GUI_DIST +GTK_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk $(CP_P) $(GTKDIR)/*.h $(DISTDIR)/src/gtk @@ -282,6 +283,14 @@ GTK_DIST: ALL_GUI_DIST $(CP_P) $(GTKDIR)/*.c $(DISTDIR)/src/gtk $(CP_P) $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk $(CP_P) $(GTKDIR)/*.mms $(DISTDIR)/src/gtk + mkdir $(DISTDIR)/include/wx/gtk1 + $(CP_P) $(INCDIR)/wx/gtk1/*.h $(DISTDIR)/include/wx/gtk1 + mkdir $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.h $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.cpp $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.c $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.xbm $(DISTDIR)/src/gtk1 + $(CP_P) $(GTK1DIR)/*.mms $(DISTDIR)/src/gtk1 mkdir $(DISTDIR)/include/wx/gtk/gnome mkdir $(DISTDIR)/src/gtk/gnome @@ -295,10 +304,9 @@ GTK_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/include/wx/mac/corefoundation $(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib -X11_DIST: ALL_GUI_DIST UNIV_DIST +X11_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11 $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11 @@ -310,7 +318,6 @@ X11_DIST: ALL_GUI_DIST UNIV_DIST mkdir $(DISTDIR)/include/wx/mac mkdir $(DISTDIR)/include/wx/mac/corefoundation $(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib MOTIF_DIST: ALL_GUI_DIST @@ -330,7 +337,6 @@ MOTIF_DIST: ALL_GUI_DIST $(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \ $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \ $(DISTDIR)/include/wx/x11 - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib MACX_DIST: ALL_GUI_DIST @@ -363,14 +369,23 @@ MACX_DIST: ALL_GUI_DIST $(CP_P) $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex $(CP_P) $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex $(CP_P) $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib -# TODO: Distribute some files COCOA_DIST: ALL_GUI_DIST + $(CP_P) $(INCDIR)/wx/cocoa/*.h $(DISTDIR)/include/wx/cocoa $(CP_P) $(COCOADIR)/*.mm $(DISTDIR)/src/cocoa + $(CP_P) $(COCOADIR)/*.cpp $(DISTDIR)/src/cocoa + $(CP_P) $(COCOADIR)/*.r $(DISTDIR)/src/cocoa + mkdir $(DISTDIR)/include/wx/mac/corefoundation + $(CP_P) $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation + mkdir $(DISTDIR)/src/mac/corefoundation + $(CP_P) $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation + mkdir $(DISTDIR)/src/mac/carbon + $(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon + $(CP_P) $(MACDIR)/carbon/wxmac.icns $(DISTDIR)/src/mac/carbon + $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib -MSW_DIST: ALL_GUI_DIST +MSW_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR) mkdir $(DISTDIR)/include/wx/msw/ole mkdir $(DISTDIR)/include/wx/msw/wince @@ -379,7 +394,7 @@ MSW_DIST: ALL_GUI_DIST $(CP_P) $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - $(CP_P) $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw + $(CP_P) $(INCDIR)/wx/msw/*.manifest $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole $(CP_P) $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince mkdir $(DISTDIR)/src/msw/ole @@ -388,6 +403,7 @@ MSW_DIST: ALL_GUI_DIST $(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw $(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw $(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole + $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib MSW_ZIP_TEXT_DIST: ALL_GUI_DIST $(CP_P) $(WXDIR)/wxWINE.spec $(DISTDIR) @@ -396,7 +412,7 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/include/wx/msw/wince $(CP_P) $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - $(CP_P) $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw + $(CP_P) $(INCDIR)/wx/msw/*.manifest $(DISTDIR)/include/wx/msw $(CP_P) $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole $(CP_P) $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince mkdir $(DISTDIR)/src/msw @@ -408,7 +424,6 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST $(CP_P) $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince $(CP_P) $(SRCDIR)/*.??? $(DISTDIR)/src $(CP_P) $(SRCDIR)/*.?? $(DISTDIR)/src - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib UNIV_DIST: ALL_GUI_DIST @@ -429,7 +444,6 @@ MGL_DIST: UNIV_DIST $(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl mkdir $(DISTDIR)/src/msdos $(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib DEMOS_DIST: ALL_GUI_DIST @@ -442,9 +456,10 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs $(CP_P) $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs $(CP_P) $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs + $(CP_P) $(DEMODIR)/bombs/*.ico $(DISTDIR)/demos/bombs + $(CP_P) $(DEMODIR)/bombs/*.rc $(DISTDIR)/demos/bombs $(CP_P) $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/demos/dbbrowse; esac $(CP_PR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse mkdir $(DISTDIR)/demos/forty @@ -455,6 +470,10 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty $(CP_P) $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty $(CP_P) $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.bmp $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.ico $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/*.rc $(DISTDIR)/demos/forty + $(CP_P) $(DEMODIR)/forty/readme.txt $(DISTDIR)/demos/forty mkdir $(DISTDIR)/demos/life mkdir $(DISTDIR)/demos/life/bitmaps @@ -465,7 +484,10 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life $(CP_P) $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life $(CP_P) $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life + $(CP_P) $(DEMODIR)/life/*.rc $(DISTDIR)/demos/life + $(CP_P) $(DEMODIR)/life/*.ico $(DISTDIR)/demos/life $(CP_P) $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps + $(CP_P) $(DEMODIR)/life/bitmaps/*.bmp $(DISTDIR)/demos/life/bitmaps mkdir $(DISTDIR)/demos/poem $(CP_P) $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem @@ -475,11 +497,15 @@ DEMOS_DIST: ALL_GUI_DIST $(CP_P) $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem $(CP_P) $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem $(CP_P) $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.rc $(DISTDIR)/demos/poem + $(CP_P) $(DEMODIR)/poem/*.ico $(DISTDIR)/demos/poem mkdir $(DISTDIR)/demos/fractal $(CP_P) $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal $(CP_P) $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal $(CP_P) $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal + $(CP_P) $(DEMODIR)/fractal/*.rc $(DISTDIR)/demos/fractal + $(CP_P) $(DEMODIR)/fractal/*.ico $(DISTDIR)/demos/fractal SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples @@ -711,38 +737,15 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image mkdir $(DISTDIR)/samples/internat - mkdir $(DISTDIR)/samples/internat/bg - mkdir $(DISTDIR)/samples/internat/cs - mkdir $(DISTDIR)/samples/internat/de - mkdir $(DISTDIR)/samples/internat/fr - mkdir $(DISTDIR)/samples/internat/ja - mkdir $(DISTDIR)/samples/internat/ka - mkdir $(DISTDIR)/samples/internat/pl - mkdir $(DISTDIR)/samples/internat/ru - mkdir $(DISTDIR)/samples/internat/sv $(CP_P) $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat $(CP_P) $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat - $(CP_P) $(SAMPDIR)/internat/bg/*.mo $(DISTDIR)/samples/internat/bg - $(CP_P) $(SAMPDIR)/internat/cs/*.mo $(DISTDIR)/samples/internat/cs - $(CP_P) $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de - $(CP_P) $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr - $(CP_P) $(SAMPDIR)/internat/ja/*.mo $(DISTDIR)/samples/internat/ja - $(CP_P) $(SAMPDIR)/internat/ka/*.mo $(DISTDIR)/samples/internat/ka - $(CP_P) $(SAMPDIR)/internat/pl/*.mo $(DISTDIR)/samples/internat/pl - $(CP_P) $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru - $(CP_P) $(SAMPDIR)/internat/sv/*.mo $(DISTDIR)/samples/internat/sv - $(CP_P) $(SAMPDIR)/internat/bg/*.po $(DISTDIR)/samples/internat/bg - $(CP_P) $(SAMPDIR)/internat/cs/*.po $(DISTDIR)/samples/internat/cs - $(CP_P) $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de - $(CP_P) $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr - $(CP_P) $(SAMPDIR)/internat/ja/*.po $(DISTDIR)/samples/internat/ja - $(CP_P) $(SAMPDIR)/internat/ka/*.po $(DISTDIR)/samples/internat/ka - $(CP_P) $(SAMPDIR)/internat/pl/*.po $(DISTDIR)/samples/internat/pl - $(CP_P) $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru - $(CP_P) $(SAMPDIR)/internat/sv/*.po $(DISTDIR)/samples/internat/sv + for f in `(cd $(SAMPDIR); find internat -name '*.[mp]o' -print)`; do \ + mkdir -p $(DISTDIR)/samples/`dirname $$f`; \ + $(CP_P) $(SAMPDIR)/$$f $(DISTDIR)/samples/$$f; \ + done mkdir $(DISTDIR)/samples/ipc $(CP_P) $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc @@ -852,7 +855,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/opengl/penguin/*.cpp $(DISTDIR)/samples/opengl/penguin $(CP_P) $(SAMPDIR)/opengl/penguin/*.c $(DISTDIR)/samples/opengl/penguin $(CP_P) $(SAMPDIR)/opengl/penguin/*.h $(DISTDIR)/samples/opengl/penguin - $(CP_P) $(SAMPDIR)/opengl/penguin/*.lwo $(DISTDIR)/samples/opengl/penguin + $(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin mkdir $(DISTDIR)/samples/opengl/cube $(CP_P) $(SAMPDIR)/opengl/cube/Makefile.in $(DISTDIR)/samples/opengl/cube $(CP_P) $(SAMPDIR)/opengl/cube/makefile.unx $(DISTDIR)/samples/opengl/cube @@ -896,15 +899,6 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate $(CP_P) $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate - mkdir $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/makefile.unx $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit - $(CP_P) $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit - mkdir $(DISTDIR)/samples/richtext mkdir $(DISTDIR)/samples/richtext/bitmaps $(CP_P) $(SAMPDIR)/richtext/Makefile.in $(DISTDIR)/samples/richtext @@ -957,6 +951,7 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/splash/*.cpp $(DISTDIR)/samples/splash $(CP_P) $(SAMPDIR)/splash/*.png $(DISTDIR)/samples/splash $(CP_P) $(SAMPDIR)/splash/*.mpg $(DISTDIR)/samples/splash + $(CP_P) $(SAMPDIR)/splash/*.xpm $(DISTDIR)/samples/splash mkdir $(DISTDIR)/samples/splitter $(CP_P) $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter @@ -1102,6 +1097,9 @@ UTILS_DIST: ALL_GUI_DIST $(CP_P) $(UTILSDIR)/helpview/Makefile.in $(DISTDIR)/utils/helpview $(CP_P) $(UTILSDIR)/helpview/src/*.h $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/*.cpp $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/*.rc $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/*.ico $(DISTDIR)/utils/helpview/src + $(CP_P) $(UTILSDIR)/helpview/src/readme.txt $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/Makefile.in $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src $(CP_P) $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps @@ -1182,7 +1180,7 @@ distdir: @GUIDIST@ @# in other dist targets. find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \ \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \ - -print | xargs rm -rf + -print | egrep -v '/(samples|dbbrowse)/.*\.hh.$$' | xargs rm -rf dist: distdir @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);