X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Makefile.am;h=3934e12e959e821e75606dea4f5e814b308809b4;hb=721d849c79d7f90afcceac7a5fe7057cc95d8bcf;hp=26f56ba91fe2a0a17055b7dbac705b1dfbab298b;hpb=b3e110a4f43d1ef0dee1f30933c777676cb71ad4;p=flightgear.git

diff --git a/Makefile.am b/Makefile.am
index 26f56ba91..3934e12e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,23 @@
 SUBDIRS = \
 	tests \
-	src
-
-EXTRA_DIST = Thanks acsite.m4 acconfig.h irix-hack.sh \
-	FlightGear.dsp FlightGear.dsw
+	man \
+        scripts \
+	src \
+        utils
+
+EXTRA_DIST = \
+	acinclude.m4 \
+	autogen.sh \
+	FlightGear.dsp \
+	FlightGear.dsw \
+	projects \
+	Thanks
 
 dist-hook:
-	(cd $(top_srcdir); $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl)
+	(cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
 	(cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
-		-cf - docs-mini hints) | (cd $(distdir); tar xvf -)
-	# tar cf - Simulator/FDM/JSBsim/aircraft Simulator/FDM/JSBsim/engine | (cd $(distdir); tar xvf -)
+		-cf - docs-mini ) | (cd $(distdir); tar xvf -)
+	rm -rf `find $(distdir)/projects -name CVS`
 
 
 ##########################################################################
@@ -22,43 +30,80 @@ dist-hook:
 # make the base distribution with textures, sounds and a bit of
 # scenery, and all the other associated files
 
-fgfs-base: fgfs-base-tar fgfs-base-zip fgfs-base-patch fgfs-textures-high
+# note, fedora core tar does case insensitive wildcard matching for
+# directories, but apparently not files ... some stupid reason. :-(
 
 fgfs-base-tar:
-	(cd $(HOME); \
-	tar --exclude=CVS \
+	(cd ..; \
+	tar \
+	--exclude=CVS \
+	--exclude='*~' \
+	--exclude='*.tex' \
+	--exclude='*.xcf' \
 	--exclude='*/c172/Instruments.high' \
-	--exclude='*/Models/Aircraft/*' \
 	--exclude='*/Textures/Unused' \
+	--exclude='*/Textures/*.orig' \
+	--exclude='*/Textures.high/*.new' \
+	--exclude='*/Textures.high/*.orig' \
 	--exclude='*/Textures.high/*.save' \
-	-czvf fgfs-base-$(VERSION).tar.gz \
-	FlightGear/A[A-su-z]* \
-	FlightGear/[B-CE-R]* \
-	FlightGear/Scenery/w130n30/w123n37 \
-	FlightGear/Scenery/w130n30/w122n37 \
-	FlightGear/Sounds \
-	FlightGear/[T-Za]* FlightGear/[c-z]*)
-
-fgfs-base-zip:
-	(cd $(HOME); \
-	zip -rv fgfs-base-$(VERSION).zip \
-	FlightGear/A[A-su-z]* \
-	FlightGear/[B-CE-R]* \
-	FlightGear/Scenery/w130n30/w123n37 \
-	FlightGear/Scenery/w130n30/w122n37 \
-	FlightGear/Sounds \
-	FlightGear/[T-Za]* FlightGear/[c-z]* \
-	-x '*/CVS/*' -x '*/Textures/Unused/*' -x '*/Models/Aircraft/*' )
-
-fgfs-base-patch:
-	(cd $(HOME); \
-	tar --newer 6/18/2001 -czvf fgfs-base-patch-$(VERSION)c.tar.gz \
-	FlightGear/A[A-su-z]* \
-	FlightGear/[B-CE-R]* \
-	FlightGear/Scenery/w130n30/w123n37 \
-	FlightGear/Scenery/w130n30/w122n37 \
-	FlightGear/Sounds \
-	FlightGear/[T-Za]* FlightGear/[c-z]*)
+	--exclude='*/data/Data' \
+	--exclude='*/Docs/source' \
+        --exclude='*/Models/MNUAV' \
+        --exclude='*/Models/Airspace' \
+	-cjvf fgfs-base-$(VERSION).tar.bz2 \
+		data/AI \
+                data/Aircraft/Generic \
+                data/Aircraft/Instruments \
+                data/Aircraft/Instruments-3d \
+                data/Aircraft/UIUC \
+                data/Aircraft/737-300 \
+                data/Aircraft/A-10 \
+                data/Aircraft/bf109 \
+                data/Aircraft/bo105 \
+                data/Aircraft/c172 \
+                data/Aircraft/c172p \
+                data/Aircraft/c310 \
+                data/Aircraft/c310u3a \
+                data/Aircraft/Citation-Bravo \
+                data/Aircraft/f16 \
+                data/Aircraft/j3cub \
+                data/Aircraft/Hunter \
+                data/Aircraft/p51d \
+                data/Aircraft/pa28-161 \
+                data/Aircraft/Rascal \
+                data/Aircraft/T38 \
+                data/Aircraft/ufo \
+                data/Aircraft/wrightFlyer1903 \
+		data/Airports \
+		data/Astro \
+		data/ATC \
+		data/AUTHORS \
+		data/ChangeLog \
+		data/cloudlayers.xml \
+		data/COPYING \
+		data/D* \
+		data/Fonts \
+		data/gui \
+		data/Huds \
+		data/Input \
+		data/joysticks.xml \
+		data/keyboard.xml \
+		data/Lighting \
+		data/materials.dtd \
+		data/materials.xml \
+		data/mice.xml \
+		data/Models \
+		data/N* \
+		data/options.xml \
+		data/preferences.xml \
+		data/Protocol \
+		data/README \
+		data/Scenery/Objects \
+		data/Scenery/Terrain \
+		data/Sounds \
+		data/T* \
+		data/version \
+	)
 
 fgfs-textures-high:
 	(cd $(HOME); \
@@ -81,7 +126,7 @@ fgfs-docs-tar:
 	tar czvf fgfs-docs-$(VERSION).tar.gz FlightGear/Docs )
 
 # fgfs-docs-zip:
-# 	( cd $(HOME)/projects ; \
+# 	( cd $(HOME)/Projects ; \
 # 	zip -r fgfs-docs-$(VERSION).zip FlightGear-0.7/docs )
 
 fgfs-manual-zip:
@@ -92,7 +137,8 @@ fgfs-manual-zip:
 
 fgfs-win32-bin:
 	(cd $(HOME); \
-	zip -r fgfs-win32-bin-$(VERSION).zip FlightGear/bin )
+	zip -r fgfs-win32-bin-$(VERSION).zip FlightGear/runfgfs.bat \
+        FlightGear/bin/Win32 )
 
 # make the win32-libs distribution (depricated)
 win32-libs: