From d6e969f6773f0d13db130921cede8b3068ac09e3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 19 Jun 2001 08:38:47 +0000
Subject: [PATCH] added [bzip-]dist-only targets to the makefile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5f7899b4b7..0a37c5509d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -950,6 +950,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples/internat
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
+	mkdir $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/makefile.unx $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
@@ -958,10 +959,10 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
-	#cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/de
+	cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/ru
 	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
-	#cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/de
+	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/ru
 
 	mkdir $(DISTDIR)/samples/ipc
 	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
@@ -1295,6 +1296,26 @@ PYTHON_DIST:
 distclean:
 	$(RM) -r _dist_dir
 
+# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
+#     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@
+	@if test "$(USE_GUI)" = 1; then \
+	cd $(DISTDIR); \
+	mv samples wxSamples-$(VER_SUFFIX); \
+	echo "*** Creating wxSamples archive..."; \
+	tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
+	mv wxSamples-$(VER_SUFFIX) samples; \
+	mv demos wxDemos-$(VER_SUFFIX); \
+	echo "*** Creating wxDemos archive..."; \
+	tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
+	mv wxDemos-$(VER_SUFFIX) demos; \
+	fi
+
 dist: @GUIDIST@
 	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
@@ -1305,13 +1326,29 @@ dist: @GUIDIST@
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
 	mv samples wxSamples-$(VER_SUFFIX); \
+	echo "*** Creating wxSamples archive..."; \
 	tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
 	mv wxSamples-$(VER_SUFFIX) samples; \
 	mv demos wxDemos-$(VER_SUFFIX); \
+	echo "*** Creating wxDemos archive..."; \
 	tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
 	mv wxDemos-$(VER_SUFFIX) demos; \
 	fi
 
+bzip-dist-only:
+	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
+	@cd _dist_dir; tar ch @DISTDIR@ | bzip2 -f9 > $(WXARCHIVE_BZIP); mv $(WXARCHIVE_BZIP) ..
+	@if test "$(USE_GUI)" = 1; then \
+	cd $(DISTDIR); \
+	mv samples wxSamples-${VER_SUFFIX}; \
+	echo "*** Creating wxSamples archive..."; \
+	tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
+	mv wxSamples-${VER_SUFFIX} samples; \
+	mv demos wxDemos-${VER_SUFFIX}; \
+	echo "*** Creating wxDemos archive..."; \
+	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)..."