X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b8f856e6f55a8a4764ea039a662e1bb4598b3fd..32ceccf56fa2c1a7f580ca92dfe74e8e0ec6217c:/build/bakefiles/make_dist.mk?ds=sidebyside diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 2b30839093..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 @@ -282,6 +283,14 @@ GTK_DIST: UNIV_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,7 +304,6 @@ GTK_DIST: UNIV_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: UNIV_DIST @@ -310,7 +318,6 @@ X11_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,7 +369,6 @@ 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 COCOA_DIST: ALL_GUI_DIST @@ -378,7 +383,6 @@ COCOA_DIST: ALL_GUI_DIST 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 - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib MSW_DIST: UNIV_DIST @@ -399,7 +403,6 @@ MSW_DIST: UNIV_DIST $(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw $(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw $(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole - case "$(CP_PR)" in *lndir) mkdir $(DISTDIR)/contrib; esac $(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib MSW_ZIP_TEXT_DIST: ALL_GUI_DIST @@ -421,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 @@ -442,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 @@ -459,7 +460,6 @@ DEMOS_DIST: ALL_GUI_DIST $(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 @@ -855,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 @@ -899,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 @@ -960,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