X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5cbcec97ddefa0815853bd11cc612dc58ef7f3e..880da677a495220275f81e0738a23da4e977e312:/build/bakefiles/make_dist.mk

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 1b16e2e179..b7b67dff2a 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -29,7 +29,6 @@ GTKDIR   = $(WXDIR)/src/gtk
 GTK1DIR  = $(WXDIR)/src/gtk1
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
-MGLDIR   = $(WXDIR)/src/mgl
 MOTIFDIR = $(WXDIR)/src/motif
 MSDOSDIR = $(WXDIR)/src/msdos
 MSWDIR   = $(WXDIR)/src/msw
@@ -138,6 +137,7 @@ ALL_DIST: distrib_clean
 	mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
+	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/wx_presets.py $(DISTDIR)/build/bakefiles/wxpresets/presets
 	mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample
 	$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample
@@ -168,6 +168,7 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx/richtext
 	mkdir $(DISTDIR)/include/wx/aui
 	mkdir $(DISTDIR)/include/wx/ribbon
+	mkdir $(DISTDIR)/include/wx/persist
 	mkdir $(DISTDIR)/include/wx/propgrid
 	mkdir $(DISTDIR)/include/wx/stc
 	mkdir $(DISTDIR)/include/wx/protocol
@@ -184,13 +185,14 @@ ALL_GUI_DIST: ALL_DIST
 	$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
 	$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
 	$(CP_P) $(INCDIR)/wx/ribbon/*.h $(DISTDIR)/include/wx/ribbon
+	$(CP_P) $(INCDIR)/wx/persist/*.h $(DISTDIR)/include/wx/persist
 	$(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid
 	$(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
+	$(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
 	$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	$(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private
 	$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
 	$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
-	$(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
 
 	mkdir $(DISTDIR)/art
 	mkdir $(DISTDIR)/art/gtk
@@ -224,7 +226,7 @@ ALL_GUI_DIST: ALL_DIST
 
 	mkdir $(DISTDIR)/src/aui
 	$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
-	
+
 	mkdir $(DISTDIR)/src/ribbon
 	$(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon
 
@@ -293,13 +295,13 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/include/wx/richtext
 	mkdir $(DISTDIR)/include/wx/aui
 	mkdir $(DISTDIR)/include/wx/ribbon
+	mkdir $(DISTDIR)/include/wx/persist
 	mkdir $(DISTDIR)/include/wx/propgrid
 	mkdir $(DISTDIR)/include/wx/stc
 	mkdir $(DISTDIR)/include/wx/osx
 	mkdir $(DISTDIR)/include/wx/osx/carbon
 	mkdir $(DISTDIR)/include/wx/osx/core
 	mkdir $(DISTDIR)/include/wx/os2
-	mkdir $(DISTDIR)/include/wx/palmos
 	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/osx
 	mkdir $(DISTDIR)/src/osx/core
@@ -307,7 +309,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/src/msdos
 	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/os2
-	mkdir $(DISTDIR)/src/palmos
 	$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
 	$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
 	list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
@@ -495,16 +496,6 @@ UNIV_DIST: ALL_GUI_DIST
 	$(CP_P) $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
 	$(CP_P) $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
 
-MGL_DIST: UNIV_DIST
-	$(CP_P) $(WXDIR)/wxMGL.spec $(DISTDIR)
-	$(CP_P) $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
-	mkdir $(DISTDIR)/include/wx/msdos
-	$(CP_P) $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
-	$(CP_P) $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
-	$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
-	mkdir $(DISTDIR)/src/msdos
-	$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
-
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	$(CP_P) $(DEMODIR)/Makefile.in $(DISTDIR)/demos
@@ -596,8 +587,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	$(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/animate
 	$(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate
 
-	$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
-
 	$(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
 
 	$(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd
@@ -653,7 +642,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	$(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc
 	$(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc
 	$(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc
-	$(CP_P) $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc
 
 UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
@@ -717,7 +705,6 @@ INTL_DIST:
 	mkdir $(DISTDIR)/locale
 	$(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale
 	$(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale
-	-$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale
 	subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
 	for dir in "$$subdirs"; do                                   \
 	    mkdir $(DISTDIR)/locale/$$dir;                           \
@@ -752,6 +739,7 @@ MANUAL_DIST:
 	mkdir $(DISTDIR)/interface/wx/html
 	mkdir $(DISTDIR)/interface/wx/msw
 	mkdir $(DISTDIR)/interface/wx/msw/ole
+	mkdir $(DISTDIR)/interface/wx/persist
 	mkdir $(DISTDIR)/interface/wx/protocol
 	mkdir $(DISTDIR)/interface/wx/propgrid
 	mkdir $(DISTDIR)/interface/wx/richtext
@@ -765,6 +753,7 @@ MANUAL_DIST:
 	$(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html
 	$(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw
 	$(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole
+	$(CP_P) $(IFACEDIR)/wx/persist/*.h $(DISTDIR)/interface/wx/persist
 	$(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol
 	$(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid
 	$(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext
@@ -931,5 +920,5 @@ rpm: bzip-dist
 	-mkdir $(RPMTOP)/RPMS
 	-mkdir $(RPMTOP)/SRPMS
 	cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
-	rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
-	mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` .
+	rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
+	mv -f `find $(RPMTOP) -name "wx-*.rpm"` .