HTMLDIR = $(WXDIR)/src/html
RICHTEXTDIR = $(WXDIR)/src/richtext
AUIDIR = $(WXDIR)/src/aui
+RIBBONDIR = $(WXDIR)/src/ribbon
PROPGRIDDIR = $(WXDIR)/src/propgrid
STCDIR = $(WXDIR)/src/stc
UNIXDIR = $(WXDIR)/src/unix
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
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
fi
mkdir $(DISTDIR)/include/wx/meta
mkdir $(DISTDIR)/include/wx/generic
+ mkdir $(DISTDIR)/include/wx/generic/private
mkdir $(DISTDIR)/include/wx/html
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
$(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
$(CP_P) $(INCDIR)/wx/meta/*.h $(DISTDIR)/include/wx/meta
$(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
+ $(CP_P) $(INCDIR)/wx/generic/private/*.h $(DISTDIR)/include/wx/generic/private
$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
$(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
mkdir $(DISTDIR)/art/motif
$(CP_P) $(WXDIR)/art/*.xpm $(DISTDIR)/art
$(CP_P) $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
$(CP_P) $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
-
+
mkdir $(DISTDIR)/src/$(TOOLKITDIR)
$(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common
$(CP_P) $(COMMDIR)/*.c $(DISTDIR)/src/common
$(CP_P) $(COMMDIR)/*.inc $(DISTDIR)/src/common
$(CP_P) $(COMMDIR)/*.mms $(DISTDIR)/src/common
-
+
mkdir $(DISTDIR)/src/xrc
$(CP_P) $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc
-
+
mkdir $(DISTDIR)/src/unix
$(CP_P) $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
$(CP_P) $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
-
+
mkdir $(DISTDIR)/src/generic
$(CP_P) $(GENDIR)/*.cpp $(DISTDIR)/src/generic
$(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
-
+
mkdir $(DISTDIR)/src/html
$(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-
+
mkdir $(DISTDIR)/src/richtext
$(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
-
+
mkdir $(DISTDIR)/src/aui
$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
+ mkdir $(DISTDIR)/src/ribbon
+ $(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon
+
mkdir $(DISTDIR)/src/propgrid
$(CP_P) $(PROPGRIDDIR)/*.cpp $(DISTDIR)/src/propgrid
$(CP_P) $(STCDIR)/*.* $(DISTDIR)/src/stc
$(CP_P) $(STCDIR)/scintilla/src/* $(DISTDIR)/src/stc/scintilla/src
$(CP_P) $(STCDIR)/scintilla/include/* $(DISTDIR)/src/stc/scintilla/include
-
+
mkdir $(DISTDIR)/src/png
$(CP_PR) $(PNGDIR)/* $(DISTDIR)/src/png
-
+
mkdir $(DISTDIR)/src/jpeg
$(CP_P) $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
$(CP_P) $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
$(CP_P) $(JPEGDIR)/*.vc $(DISTDIR)/src/jpeg
$(CP_P) $(JPEGDIR)/makefile.* $(DISTDIR)/src/jpeg
$(CP_P) $(JPEGDIR)/README $(DISTDIR)/src/jpeg
-
+
mkdir $(DISTDIR)/src/tiff
mkdir $(DISTDIR)/src/tiff/config
mkdir $(DISTDIR)/src/tiff/contrib
mkdir $(DISTDIR)/include/wx/html
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
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 \
$(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/x11/private
+ $(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
mkdir $(DISTDIR)/include/wx/gtk/gnome
mkdir $(DISTDIR)/src/gtk/gnome
mkdir $(DISTDIR)/src/gtk/hildon
$(CP_P) $(INCDIR)/wx/gtk/hildon/*.h $(DISTDIR)/include/wx/gtk/hildon
$(CP_P) $(GTKDIR)/hildon/*.cpp $(DISTDIR)/src/gtk/hildon
-
+
mkdir $(DISTDIR)/src/osx
mkdir $(DISTDIR)/src/osx/core
$(CP_P) $(WXDIR)/src/osx/core/*.cpp $(DISTDIR)/src/osx/core
X11_DIST: UNIV_DIST
$(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
+ mkdir $(DISTDIR)/include/wx/x11/private
+ $(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
mkdir $(DISTDIR)/include/wx/gtk/private
$(CP_P) $(INCDIR)/wx/gtk/private/string.h $(DISTDIR)/include/wx/gtk/private
$(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
$(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
+ mkdir $(DISTDIR)/include/wx/x11/private
+ $(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
OSX_CARBON_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
$(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
$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
- # copy files common to all samples in a general way
- for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
+ # copy files common to all samples in a general way (samples without
+ # Makefile.in in them are Windows-specific and shouldn't be included in
+ # Unix distribution)
+ for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
-mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
+ if [ ! -f $$s/Makefile.in ]; then continue; fi; \
t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
mkdir -p $$t; \
$(CP_P) $$s/Makefile.in \
$(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
$(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
- $(CP_P) $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
-
$(CP_P) $(SAMPDIR)/opengl/penguin/trackball.c $(DISTDIR)/samples/opengl/penguin
$(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin
$(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
$(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
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; \
mkdir $(DISTDIR)/interface
mkdir $(DISTDIR)/interface/wx
mkdir $(DISTDIR)/interface/wx/aui
+ mkdir $(DISTDIR)/interface/wx/ribbon
mkdir $(DISTDIR)/interface/wx/generic
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
mkdir $(DISTDIR)/interface/wx/xrc
$(CP_P) $(IFACEDIR)/wx/*.h $(DISTDIR)/interface/wx
$(CP_P) $(IFACEDIR)/wx/aui/*.h $(DISTDIR)/interface/wx/aui
+ $(CP_P) $(IFACEDIR)/wx/ribbon/*.h $(DISTDIR)/interface/wx/ribbon
$(CP_P) $(IFACEDIR)/wx/generic/*.h $(DISTDIR)/interface/wx/generic
$(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
fi
win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DIST
-# RR: copy VC files common to all samples in a general way
- for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
+ for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
-mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
$(CP_P) \
@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico
@cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp
-debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@
-debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
- mkdir $(DISTDIR)/debian
- -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian
- $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs
- $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
- $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs
- rm -f $(DISTDIR)/*.spec
-
- @# now prune away a lot of the crap included by using cp -R
- @# in other dist targets. Ugly and hardly portable but it
- @# will run on any Debian box and that's enough for now.
-
- find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \
- -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \
- -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \
- -o -name "*.pro" \
- -o -name "*.vpj" \
- -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
- \) -print0 | xargs -0 rm -rf
-
- rm -rf $(DISTDIR)/wxPython/SWIG
- rm -rf $(DISTDIR)/wxPython/distrib
- rm -rf $(DISTDIR)/wxPython/distutils
- rm -rf $(DISTDIR)/wxPython/samples
- rm -rf $(DISTDIR)/wxPython/contrib/iewin
- find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
-
- rm -rf $(DEBIAN_SOURCE_DIR)
- mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
-
-
-debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
-
-debian-msw-dirs:
- mkdir $(DISTDIR)/include/wx/msw
- mkdir $(DISTDIR)/src/msw
+@IF_GNU_MAKE@debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@
+@IF_GNU_MAKE@debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
+@IF_GNU_MAKE@ mkdir $(DISTDIR)/debian
+@IF_GNU_MAKE@ -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian
+@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs
+@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
+@IF_GNU_MAKE@ $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs
+@IF_GNU_MAKE@ rm -f $(DISTDIR)/*.spec
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@ @# now prune away a lot of the crap included by using cp -R
+@IF_GNU_MAKE@ @# in other dist targets. Ugly and hardly portable but it
+@IF_GNU_MAKE@ @# will run on any Debian box and that's enough for now.
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@ find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \
+@IF_GNU_MAKE@ -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \
+@IF_GNU_MAKE@ -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \
+@IF_GNU_MAKE@ -o -name "*.pro" \
+@IF_GNU_MAKE@ -o -name "*.vpj" \
+@IF_GNU_MAKE@ -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
+@IF_GNU_MAKE@ \) -print0 | xargs -0 rm -rf
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/SWIG
+@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/distrib
+@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/distutils
+@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/samples
+@IF_GNU_MAKE@ rm -rf $(DISTDIR)/wxPython/contrib/iewin
+@IF_GNU_MAKE@ find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@ rm -rf $(DEBIAN_SOURCE_DIR)
+@IF_GNU_MAKE@ mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
+
+
+@IF_GNU_MAKE@debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
+
+@IF_GNU_MAKE@debian-msw-dirs:
+@IF_GNU_MAKE@ mkdir $(DISTDIR)/include/wx/msw
+@IF_GNU_MAKE@ mkdir $(DISTDIR)/src/msw
RPMTOP=_dist_dir/_rpm_top
-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"` .
projects / wxWidgets.git / blobdiff