Merge branch 'vivian/cullsetting'

[flightgear.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b60f559a5dc7cafed5052dc1df85b2d716edc31b..c86f1c148db55d173441589ad76e6ec8145c694f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,16 +6,20 @@ SUBDIRS = \
         utils
 
 EXTRA_DIST = \
-       Thanks \
        acinclude.m4 \
        autogen.sh \
-       FlightGear.dsp \
-       FlightGear.dsw
+       projects \
+       README \
+       README.OpenAL \
+       README.plib \
+       README.OSG \
+       README.SimGear \
+       Thanks
 
 dist-hook:
-       (cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
        (cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
                -cf - docs-mini ) | (cd $(distdir); tar xvf -)
+       rm -rf `find $(distdir)/projects -name CVS`
 
 
 ##########################################################################
@@ -28,7 +32,10 @@ dist-hook:
 # make the base distribution with textures, sounds and a bit of
 # scenery, and all the other associated files
 
-fgfs-base-tar:
+# note, fedora core tar does case insensitive wildcard matching for
+# directories, but apparently not files ... some stupid reason. :-(
+
+data-tar:
        (cd ..; \
        tar \
        --exclude=CVS \
@@ -37,45 +44,66 @@ fgfs-base-tar:
        --exclude='*.xcf' \
        --exclude='*/c172/Instruments.high' \
        --exclude='*/Textures/Unused' \
-       --exclude='*/Textures.high/*.save' \
+       --exclude='*/Textures/*.orig' \
        --exclude='*/Textures.high/*.new' \
+       --exclude='*/Textures.high/*.orig' \
+       --exclude='*/Textures.high/*.save' \
+       --exclude='*/data/Data' \
        --exclude='*/Docs/source' \
         --exclude='*/Models/MNUAV' \
-       -cvf - \
+        --exclude='*/Models/Airspace' \
+       -cjvf FlightGear-data-$(VERSION).tar.bz2 \
+               data/AI \
                 data/Aircraft/Generic \
                 data/Aircraft/Instruments \
                 data/Aircraft/Instruments-3d \
                 data/Aircraft/UIUC \
-                data/Aircraft/737 \
-                data/Aircraft/A-10 \
+               data/Aircraft/777-200 \
+               data/Aircraft/A6M2 \
+               data/Aircraft/b1900d \
                 data/Aircraft/bo105 \
-                data/Aircraft/c172 \
                 data/Aircraft/c172p \
-                data/Aircraft/c310 \
-                data/Aircraft/c310u3a \
-                data/Aircraft/Citation \
-                data/Aircraft/f16 \
-                data/Aircraft/j3cub \
-                data/Aircraft/Hunter \
-                data/Aircraft/p51d \
-                data/Aircraft/pa28-161 \
+                data/Aircraft/CitationX \
+               data/Aircraft/Dragonfly \
+               data/Aircraft/dhc2 \
+               data/Aircraft/f-14b \
+               data/Aircraft/j3cub \
+               data/Aircraft/SenecaII \
+               data/Aircraft/sopwithCamel \
                 data/Aircraft/ufo \
-                data/Aircraft/wrightFlyer1903 \
+               data/Aircraft/ZLT-NT \
                data/Airports \
                data/Astro \
                data/ATC \
                data/AUTHORS \
-               data/[C-H]* \
+               data/ChangeLog \
+               data/cloudlayers.xml \
+               data/COPYING \
+               data/D* \
+               data/Effects \
+               data/Fonts \
+               data/gui \
+               data/Huds \
                data/Input \
-               data/[J-R]* \
-               data/Scenery \
+               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/Airports \
+               data/Scenery/Objects \
+               data/Scenery/Terrain \
+               data/Shaders \
                data/Sounds \
                data/T* \
-               data/cloudlayers.xml \
-               data/gui \
-               data/[j-p]* \
                data/version \
-       | bzip2 --best > fgfs-base-$(VERSION).tar.bz2 \
        )
 
 fgfs-textures-high: