Added support for $FG_SCENERY and --fg-scenery=path

[flightgear.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c78d544c58ca1325ce34542e40002edb243697cd..ed08229b722c2274c25b17b5f9dfa169039074b3 100644 (file)
--- 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 -)
 
 
 ##########################################################################
@@ -19,42 +20,55 @@ 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: fgfs-base-tar fgfs-base-zip fgfs-base-patch
 
 fgfs-base-tar:
        (cd $(HOME); \
-       tar czvf fgfs-base-$(VERSION).tar.gz \
-       FlightGear/[A-R]* \
+       tar czvf fgfs-base-$(VERSION)b.tar.gz \
+       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]* \
+       zip -ryv fgfs-base-$(VERSION)b.zip \
+       FlightGear/[A-CE-R]* \
        FlightGear/Scenery/w120n30/w111n33 \
        FlightGear/Sounds \
        FlightGear/Textures FlightGear/Thanks \
-       FlightGear/[m-r]* )
+       FlightGear/[T-W]* FlightGear/[c-z]*)
+
+fgfs-base-patch:
+       (cd $(HOME); \
+       tar --newer 5/18/2000 -czvf fgfs-base-patch-$(VERSION)b.tar.gz \
+       FlightGear/[A-CE-R]* \
+       FlightGear/Scenery/w120n30/w111n33 \
+       FlightGear/Sounds \
+       FlightGear/[T-W]* FlightGear/[c-m]*)
 
+# 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-manual-zip
 
 fgfs-docs-tar:
-       ( cd .. ; \
-       tar czvf fgfs-docs-$(VERSION).tar.gz FlightGear/Docs )
+       ( cd ../.. ; \
+       tar czvf fgfs-docs-$(VERSION).tar.gz FlightGear-0.7/docs )
 
 # fgfs-docs-zip:
-#      ( cd .. ; \
-#      zip -r fgfs-docs-$(VERSION).zip FlightGear/Docs )
+#      ( cd ../.. ; \
+#      zip -r fgfs-docs-$(VERSION).zip FlightGear-0.7/docs )
 
 fgfs-manual-zip:
-       ( cd .. ; \
-       zip -r fgfs-manual-$(VERSION).zip FlightGear/Docs/InstallGuide )
+       ( cd ../.. ; \
+       zip -r fgfs-manual-$(VERSION).zip FlightGear-0.7/docs/InstallGuide )
 
 # make the win32-bin distribution
 
@@ -62,7 +76,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 \
@@ -79,24 +93,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