Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More corrections to make dist

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-08-28 13:28:56 +00:00
parent 2a00b84736
commit b784691e07
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@@ -32275,11 +32275,14 @@ DEMOS_DIST: ALL_GUI_DIST
SAMPLES_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
$(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 \
-mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
-mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
mkdir -p $$t; \
$(CP_P) $$s/Makefile.in \
@@ -32510,7 +32513,7 @@ distdir: @GUIDIST@
@# now prune away a lot of the crap included by using cp -R
@# 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" \) \) \
\( -name "makefile.*" -a ! -name "makefile.gcc" -a ! -name "makefile.unx" \) \) \
-print | egrep -v '/samples/.*\.hh.$$' | xargs rm -rf
dist: distdir

7
build/bakefiles/make_dist.mk
View File

@@ -544,11 +544,14 @@ DEMOS_DIST: ALL_GUI_DIST
SAMPLES_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
$(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 \
-mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
-mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
mkdir -p $$t; \
$(CP_P) $$s/Makefile.in \
@@ -779,7 +782,7 @@ distdir: @GUIDIST@
@# now prune away a lot of the crap included by using cp -R
@# 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" \) \) \
\( -name "makefile.*" -a ! -name "makefile.gcc" -a ! -name "makefile.unx" \) \) \
-print | egrep -v '/samples/.*\.hh.$$' | xargs rm -rf
dist: distdir