Attempt to merge LED font patches back in (they were wiped out by

[flightgear.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eca1d23946b65307eceeb6b1e4a74c75256f319a..0fd21ccc04bb4784e7b35ee606eafcae49bb10a3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,15 @@
 SUBDIRS = \
        tests \
+       man \
        src
 
-EXTRA_DIST = Thanks VERSION acsite.m4 acconfig.h irix-hack.pl
+EXTRA_DIST = Thanks acsite.m4 acconfig.h irix-hack.sh \
+       FlightGear.dsp FlightGear.dsw
 
 dist-hook:
-       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 -)
+       (cd $(top_srcdir); $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl)
+       (cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
+               -cf - docs-mini ) | (cd $(distdir); tar xvf -)
 
 
 ##########################################################################
@@ -20,35 +22,48 @@ 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-base: fgfs-base-tar fgfs-base-zip fgfs-base-patch fgfs-textures-high
 
 fgfs-base-tar:
        (cd $(HOME); \
-       tar czvf fgfs-base-$(VERSION)b.tar.gz \
+       tar --exclude=CVS \
+       --exclude='*/c172/Instruments.high' \
+       --exclude='*/Models/Aircraft/*' \
+       --exclude='*/Textures/Unused' \
+       --exclude='*/Textures.high/*.save' \
+       -czvf fgfs-base-$(VERSION).tar.gz \
        FlightGear/A[A-su-z]* \
        FlightGear/[B-CE-R]* \
-       FlightGear/Scenery/w120n30/w111n33 \
+       FlightGear/Scenery/w130n30/w123n37 \
+       FlightGear/Scenery/w130n30/w122n37 \
        FlightGear/Sounds \
-       FlightGear/[T-W]* FlightGear/[c-m]*)
+       FlightGear/[T-Za]* FlightGear/[c-z]*)
 
 fgfs-base-zip:
        (cd $(HOME); \
-       zip -rv fgfs-base-$(VERSION)b.zip \
+       zip -rv fgfs-base-$(VERSION).zip \
        FlightGear/A[A-su-z]* \
        FlightGear/[B-CE-R]* \
-       FlightGear/Scenery/w120n30/w111n33 \
+       FlightGear/Scenery/w130n30/w123n37 \
+       FlightGear/Scenery/w130n30/w122n37 \
        FlightGear/Sounds \
-       FlightGear/Textures FlightGear/Thanks \
-       FlightGear/[T-W]* FlightGear/[c-z]*)
+       FlightGear/[T-Za]* FlightGear/[c-z]* \
+       -x '*/CVS/*' -x '*/Textures/Unused/*' -x '*/Models/Aircraft/*' )
 
 fgfs-base-patch:
        (cd $(HOME); \
-       tar --newer 9/18/2000 -czvf fgfs-base-patch-$(VERSION).tar.gz \
+       tar --newer 6/18/2001 -czvf fgfs-base-patch-$(VERSION)c.tar.gz \
        FlightGear/A[A-su-z]* \
        FlightGear/[B-CE-R]* \
-       FlightGear/Scenery/w120n30/w111n33 \
+       FlightGear/Scenery/w130n30/w123n37 \
+       FlightGear/Scenery/w130n30/w122n37 \
        FlightGear/Sounds \
-       FlightGear/[T-W]* FlightGear/[c-m]*)
+       FlightGear/[T-Za]* FlightGear/[c-z]*)
+
+fgfs-textures-high:
+       (cd $(HOME); \
+       tar -czvf fgfs-textures-high-$(VERSION)b.tar.gz \
+       FlightGear/Textures.high)
 
 # make the mini JSBsim data distribution
 jsbsim-data:
@@ -62,16 +77,16 @@ jsbsim-data:
 fgfs-docs: fgfs-docs-tar fgfs-manual-zip
 
 fgfs-docs-tar:
-       ( cd ../.. ; \
-       tar czvf fgfs-docs-$(VERSION).tar.gz FlightGear-0.7/docs )
+       ( cd $(HOME); \
+       tar czvf fgfs-docs-$(VERSION).tar.gz FlightGear/Docs )
 
 # fgfs-docs-zip:
-#      ( cd ../.. ; \
+#      ( cd $(HOME)/projects ; \
 #      zip -r fgfs-docs-$(VERSION).zip FlightGear-0.7/docs )
 
 fgfs-manual-zip:
-       ( cd ../.. ; \
-       zip -r fgfs-manual-$(VERSION).zip FlightGear-0.7/docs/InstallGuide )
+       ( cd $(HOME) ; \
+       zip -r fgfs-manual-$(VERSION).zip FlightGear/Docs/InstallGuide )
 
 # make the win32-bin distribution