Merge branch 'master' into next

[simgear.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae7eb9c68624520d5b9097b0f7bd85674e5ddb5c..f88767c37d7fb194a480d578987d04cc5ce909c0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,18 @@
 EXTRA_DIST = \
        acinclude.m4 \
        autogen.sh \
-       DoxygenMain.cxx
-       README.MSVC \
-       README.metakit \
+       DoxygenMain.cxx \
        README.zlib \
-       SimGear.dsp \
-       SimGear.dsw
+       README.plib \
+       README.OpenAL \
+       README.OSG \
+       projects
 
-SUBDIRS        = src-libs simgear
+SUBDIRS        = simgear
 
 dist-hook:
-       (cd $(top_srcdir); $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl)
+       (cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
+       rm -rf `find $(distdir)/projects -name CVS`
 
 #
 # Rule to build RPM distribution package