X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Makefile.am;h=9a5e299cd21f58f3bb6c498f4cece4ea597efea4;hb=28f17b105212d06e1c29ac332477c15a45e46e52;hp=b6b69dfcc27b658793a513df3e8310daeac730eb;hpb=4328c2e43ba6e9f65e57ed7cf88edbebba32f9e0;p=flightgear.git

diff --git a/Makefile.am b/Makefile.am
index b6b69dfcc..9a5e299cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,13 @@
-SUBDIRS = Include Lib Simulator Tools Tests
+SUBDIRS = \
+	tests \
+	src
 
-EXTRA_DIST = README.Unix README.Linux README.MacOS README.Win32 \
-	README.autoconf README.running Thanks VERSION acsite.m4 acconfig.h \
-	irix-hack.pl
+EXTRA_DIST = Thanks VERSION acsite.m4 acconfig.h irix-hack.pl
 
 dist-hook:
-	tar cf - Hints | (cd $(distdir); tar xvf -)
-	tar cf - Simulator/FDM/JSBsim/aircraft Simulator/FDM/JSBsim/engine | (cd $(distdir); tar xvf -)
+	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 -)
 
 
 ##########################################################################
@@ -24,34 +25,42 @@ fgfs-base: fgfs-base-tar fgfs-base-zip
 fgfs-base-tar:
 	(cd $(HOME); \
 	tar czvf fgfs-base-$(VERSION).tar.gz \
-	FlightGear/[A-R]* \
-	FlightGear/Scenery/w120n030/w111n033 \
+	FlightGear/[A-CE-R]* \
+	FlightGear/Scenery/w120n30/w111n33 \
 	FlightGear/Sounds \
-	FlightGear/Textures FlightGear/Thanks \
-	FlightGear/[m-r]* )
+	FlightGear/[T-W]* FlightGear/[c-m]*)
 
 fgfs-base-zip:
 	(cd $(HOME); \
-	zip -r fgfs-base-$(VERSION).zip \
-	FlightGear/[A-R]* \
-	FlightGear/Scenery/w120n030/w111n033 \
+	zip -ryv fgfs-base-$(VERSION).zip \
+	FlightGear/[A-CE-R]* \
+	FlightGear/Scenery/w120n30/w111n33 \
 	FlightGear/Sounds \
 	FlightGear/Textures FlightGear/Thanks \
-	FlightGear/[m-r]* )
+	FlightGear/[T-W]* FlightGear/[c-z]*)
 
+# 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 .. ; \
-	tar czvf fgfs-docs-$(VERSION).tar.gz FlightGear/Docs )
+	( cd ../.. ; \
+	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 ../.. ; \
+# 	zip -r fgfs-docs-$(VERSION).zip FlightGear/docs )
 
+fgfs-manual-zip:
+	( cd ../.. ; \
+	zip -r fgfs-manual-$(VERSION).zip FlightGear/docs/InstallGuide )
 
 # make the win32-bin distribution
 
@@ -59,7 +68,7 @@ fgfs-win32-bin:
 	(cd $(HOME); \
 	zip -r fgfs-win32-bin-$(VERSION).zip FlightGear/bin )
 
-# 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 \
@@ -76,24 +85,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