1. added erase and event samples to the distribution
2. tar.bz2 now unpacks into wxTOOLKIT-VERSION and not wxTOOLKIT as well git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
30
Makefile.in
30
Makefile.in
@@ -164,7 +164,8 @@ WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
|
||||
WXSAMPLES_BZIP=wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
|
||||
WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
|
||||
|
||||
DISTDIR = ./_dist_dir/@DISTDIR@
|
||||
DISTDIRNAME=@DISTDIR@-$(VER_SUFFIX)
|
||||
DISTDIR=./_dist_dir/$(DISTDIRNAME)
|
||||
|
||||
|
||||
############################## Files ##################################
|
||||
@@ -872,6 +873,16 @@ SAMPLES_DIST: ALL_GUI_DIST
|
||||
cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
|
||||
cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
|
||||
|
||||
mkdir $(DISTDIR)/samples/erase
|
||||
cp $(SAMPDIR)/erase/Makefile.in $(DISTDIR)/samples/erase
|
||||
cp $(SAMPDIR)/erase/makefile.unx $(DISTDIR)/samples/erase
|
||||
cp $(SAMPDIR)/erase/*.cpp $(DISTDIR)/samples/erase
|
||||
|
||||
mkdir $(DISTDIR)/samples/event
|
||||
cp $(SAMPDIR)/event/Makefile.in $(DISTDIR)/samples/event
|
||||
cp $(SAMPDIR)/event/makefile.unx $(DISTDIR)/samples/event
|
||||
cp $(SAMPDIR)/event/*.cpp $(DISTDIR)/samples/event
|
||||
|
||||
mkdir $(DISTDIR)/samples/exec
|
||||
cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
|
||||
cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
|
||||
@@ -1300,10 +1311,7 @@ distclean:
|
||||
# the files twice
|
||||
dist-only:
|
||||
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
|
||||
@cd _dist_dir; \
|
||||
mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
|
||||
tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
|
||||
mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
|
||||
@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
|
||||
@if test "$(USE_GUI)" = 1; then \
|
||||
cd $(DISTDIR); \
|
||||
mv samples wxSamples-$(VER_SUFFIX); \
|
||||
@@ -1317,12 +1325,9 @@ dist-only:
|
||||
fi
|
||||
|
||||
dist: @GUIDIST@
|
||||
cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
|
||||
cp $(WXDIR)/src/files.lst $(DISTDIR)/src
|
||||
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
|
||||
@cd _dist_dir; \
|
||||
mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
|
||||
tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
|
||||
mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
|
||||
@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
|
||||
@if test "$(USE_GUI)" = 1; then \
|
||||
cd $(DISTDIR); \
|
||||
mv samples wxSamples-$(VER_SUFFIX); \
|
||||
@@ -1337,7 +1342,7 @@ dist: @GUIDIST@
|
||||
|
||||
bzip-dist-only:
|
||||
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
|
||||
@cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
|
||||
@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
|
||||
@if test "$(USE_GUI)" = 1; then \
|
||||
cd $(DISTDIR); \
|
||||
mv samples wxSamples-${VER_SUFFIX}; \
|
||||
@@ -1349,10 +1354,11 @@ bzip-dist-only:
|
||||
tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
|
||||
mv wxDemos-${VER_SUFFIX} demos; \
|
||||
fi
|
||||
|
||||
bzip-dist: @GUIDIST@
|
||||
cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
|
||||
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
|
||||
cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
|
||||
@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
|
||||
@if test "$(USE_GUI)" = 1; then \
|
||||
cd $(DISTDIR); \
|
||||
mv samples wxSamples; \
|
||||
|
Reference in New Issue
Block a user