Merge branch 'vivian/cullsetting'

[flightgear.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 26d0a923df278e05c431ac564b800419f9619b27..c86f1c148db55d173441589ad76e6ec8145c694f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,6 @@ SUBDIRS = \
 EXTRA_DIST = \
        acinclude.m4 \
        autogen.sh \
-       FlightGear.dsp \
-       FlightGear.dsw \
        projects \
        README \
        README.OpenAL \
@@ -19,7 +17,6 @@ EXTRA_DIST = \
        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`
@@ -55,30 +52,26 @@ data-tar:
        --exclude='*/Docs/source' \
         --exclude='*/Models/MNUAV' \
         --exclude='*/Models/Airspace' \
-       -cjvf source/FlightGear-data-$(VERSION).tar.bz2 \
+       -cjvf FlightGear-data-$(VERSION).tar.bz2 \
                data/AI \
                 data/Aircraft/Generic \
                 data/Aircraft/Instruments \
                 data/Aircraft/Instruments-3d \
                 data/Aircraft/UIUC \
-                data/Aircraft/737-300 \
-                data/Aircraft/A-10 \
-                data/Aircraft/bf109 \
+               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-Bravo \
-                data/Aircraft/f16 \
-                data/Aircraft/j3cub \
-                data/Aircraft/Hunter \
-                data/Aircraft/p51d \
-                data/Aircraft/pa28-161 \
-                data/Aircraft/Rascal \
-                data/Aircraft/T38 \
+                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 \
@@ -87,6 +80,7 @@ data-tar:
                data/cloudlayers.xml \
                data/COPYING \
                data/D* \
+               data/Effects \
                data/Fonts \
                data/gui \
                data/Huds \
@@ -103,8 +97,10 @@ data-tar:
                data/preferences.xml \
                data/Protocol \
                data/README \
+               data/Scenery/Airports \
                data/Scenery/Objects \
                data/Scenery/Terrain \
+               data/Shaders \
                data/Sounds \
                data/T* \
                data/version \