X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=fbc590618f518f070bcf94590c41559bc7b322e9;hb=c362ca795c465ad238743d32d9f1661d2daf134c;hp=b29fbbc7696f4e1957edf416bd4a448b6b3b70bf;hpb=9e53178dfd8f82033cdb905da914941f2463ba3b;p=flightgear.git

diff --git a/Makefile.am b/Makefile.am
index b29fbbc76..fbc590618 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,21 @@
-SUBDIRS = Include Lib Simulator Tools Tests
-
-EXTRA_DIST = README.Unix README.Linux README.MacOS README.Win32 \
-	README.autoconf README.running Thanks VERSION acsite.m4
+SUBDIRS = \
+	tests \
+	man \
+        scripts \
+	src \
+        utils
+
+EXTRA_DIST = \
+	Thanks \
+	acinclude.m4 \
+	autogen.sh \
+	FlightGear.dsp \
+	FlightGear.dsw
 
 dist-hook:
-	tar cf - Hints | (cd $(distdir); tar xvf -)
+	(cd $(top_srcdir); $(HOME)/Projects/FlightGear-0.9/admin/am2dsp.pl)
+	(cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
+		-cf - docs-mini ) | (cd $(distdir); tar xvf -)
 
 
 ##########################################################################
@@ -17,47 +28,114 @@ 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-tar:
+	(cd ..; \
+	tar \
+	--exclude=CVS \
+	--exclude='*~' \
+	--exclude='*.tex' \
+	--exclude='*.xcf' \
+	--exclude='*/c172/Instruments.high' \
+	--exclude='*/Textures/Unused' \
+	--exclude='*/Textures.high/*.save' \
+	--exclude='*/Textures.high/*.new' \
+	--exclude='*/Docs/source' \
+	-cvf - \
+		data/ATC \
+		data/AUTHORS \
+                data/Aircraft/737 \
+                data/Aircraft/747 \
+                data/Aircraft/A-10 \
+                data/Aircraft/A320 \
+                data/Aircraft/AN-225 \
+                data/Aircraft/B-52F \
+                data/Aircraft/BAC-TSR2 \
+                data/Aircraft/ComperSwift \
+                data/Aircraft/Generic \
+                data/Aircraft/Hunter \
+                data/Aircraft/Instruments \
+                data/Aircraft/Instruments-3d \
+                data/Aircraft/OV10 \
+                data/Aircraft/Spitfire \
+                data/Aircraft/T38 \
+                data/Aircraft/UIUC \
+                data/Aircraft/X15 \
+                data/Aircraft/YF-23 \
+                data/Aircraft/a4 \
+                data/Aircraft/beech99 \
+                data/Aircraft/bo105 \
+                data/Aircraft/c172 \
+                data/Aircraft/c172-fs-set.xml \
+                data/Aircraft/c172-le \
+                data/Aircraft/c172p \
+                data/Aircraft/c172r \
+                data/Aircraft/c172x \
+                data/Aircraft/c182 \
+                data/Aircraft/c310 \
+                data/Aircraft/c310u3a \
+                data/Aircraft/dc3 \
+                data/Aircraft/f16 \
+                data/Aircraft/j22 \
+                data/Aircraft/j3cub \
+                data/Aircraft/ornithopter \
+                data/Aircraft/p51d \
+                data/Aircraft/pa28-161 \
+                data/Aircraft/seahawk \
+                data/Aircraft/sgs233 \
+                data/Aircraft/t6texan2 \
+                data/Aircraft/tu154 \
+                data/Aircraft/ufo \
+                data/Aircraft/wrightFlyer1903 \
+		data/Airports \
+		data/Astro \
+		data/[C-H]* \
+		data/Input \
+		data/[J-R]* \
+		data/Scenery \
+		data/Sounds \
+		data/[T-W]* \
+		data/gui \
+		data/[j-p]* \
+		data/version \
+	| bzip2 --best > fgfs-base-$(VERSION).tar.bz2 \
+	)
+
+fgfs-textures-high:
 	(cd $(HOME); \
-	tar czvf fgfs-base-$(VERSION).tar.gz \
-	FlightGear/[A-R]* \
-	FlightGear/Scenery/w120n030/w111n033 \
-	FlightGear/Sounds \
-	FlightGear/Textures FlightGear/Thanks \
-	FlightGear/[m-r]* )
-
-fgfs-base-zip:
-	(cd $(HOME); \
-	zip -r fgfs-base-$(VERSION).zip \
-	FlightGear/[A-R]* \
-	FlightGear/Scenery/w120n030/w111n033 \
-	FlightGear/Sounds \
-	FlightGear/Textures FlightGear/Thanks \
-	FlightGear/[m-r]* )
+	tar -czvf fgfs-textures-high-$(VERSION)b.tar.gz \
+	FlightGear/Textures.high)
 
+# make the mini JSBsim data distribution
+jsbsim-data:
+	(cd $(HOME); \
+	tar czvf jsbsim-data-$(VERSION).tar.gz \
+	FlightGear/Aircraft \
+	FlightGear/Engine)
 
 # make the documentation distribution
 
-fgfs-docs: fgfs-docs-tar fgfs-docs-zip
+fgfs-docs: fgfs-docs-tar fgfs-manual-zip
 
 fgfs-docs-tar:
-	( cd .. ; \
+	( cd $(HOME); \
 	tar czvf fgfs-docs-$(VERSION).tar.gz FlightGear/Docs )
 
-fgfs-docs-zip:
-	( cd .. ; \
-	zip -r fgfs-docs-$(VERSION).zip FlightGear/Docs )
+# fgfs-docs-zip:
+# 	( cd $(HOME)/Projects ; \
+# 	zip -r fgfs-docs-$(VERSION).zip FlightGear-0.7/docs )
 
+fgfs-manual-zip:
+	( cd $(HOME) ; \
+	zip -r fgfs-manual-$(VERSION).zip FlightGear/Docs/InstallGuide )
 
 # make the win32-bin distribution
 
 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
+# make the win32-libs distribution (depricated)
 win32-libs:
 	( zip -r ../win32-libs-$(VERSION).zip Win32/Makefile \
 	Win32/README.glut Win32/cygwinb1.dll Win32/def \
@@ -74,24 +152,23 @@ macos-devel:
 # clean up dependencies
 clean-deps:
 	rm -rf .deps \
-	Lib/.deps Simulator/.deps Tools/.deps Test/.deps \
-	Lib/*/.deps Simulator/*/.deps Tools/*/.deps \
-	Lib/*/*/.deps Simulator/*/*/.deps Tools/*/*/.deps \
-	Tests/.deps
+	src/.deps tests/.deps \
+	src/*/.deps \
+	src/*/*/.deps \
+	tests/.deps
 
 # clean up after libtool
 clean-libs:
-	rm -rf .libs Lib/.libs Simulator/.libs Tools/.libs \
-		Lib/*/.libs Simulator/*/.libs Tools/*/.libs \
-		Lib/*/*/.libs Simulator/*/*/.libs Tools/*/*/.libs
-	rm -f Simulator/*/so_locations Lib/*/so_locations \
-		Simulator/*/*/so_locations Lib/*/*/so_locations
+	rm -rf .libs src/.libs \
+		src/*/.libs \
+		src/*/*/.libs 
+	rm -f src/*/so_locations \
+		src/*/*/so_locations 
 
 # clean up after winbloze spews random case for file names :-(
 clean-winbloze: clean-deps clean-libs
-	rm -f makefile Include/makefile Lib/makefile Simulator/makefile \
-		Tools/makefile \
-		Lib/*/makefile Simulator/*/makefile Tools/*/makefile \
-		Lib/*/*/makefile Simulator/*/*/makefile Tools/*/*/makefile \
-		Tests/makefile
-	rm -f Src/Main/fg.exe Tools/*/*.exe
+	rm -f makefile src/Include/makefile src/makefile \
+		src/*/makefile \
+		src/*/*/makefile \
+		tests/makefile
+	rm -f src/Main/fg.exe