Updated to automatically handle newer versions of automake.

[simgear.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c9d11af4daf5e0e08ece731945a82b4b776ed8be..309596aadf4fcb69345ee35e1fe1e9f2214cffcf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,13 @@
-EXTRA_DIST     = mksymlinks.sh acsite.m4 acconfig.h SimGear.dsp SimGear.dsw
+EXTRA_DIST = \
+       acsite.m4 \
+       acconfig.h \
+       mksymlinks.sh \
+       SimGear.dsp \
+       SimGear.dsw \
+       metakit-2.4.2-32.tar.gz \
+       zlib-1.1.3.tar.gz
 
-SUBDIRS                = simgear
+SUBDIRS        = simgear
 
 #
 # Additional all, clean, and distclean rules for additional packages.
@@ -8,7 +15,7 @@ SUBDIRS                = simgear
 # would be nice because there are then problems with make dist
 #
 
-all: 
+old_all: 
        @list='@subdirs@'; \
        target=`echo $@`; \
        for subdir in $$list; do \
@@ -23,7 +30,7 @@ all:
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done
 
-install: 
+old_install: 
        @list='@subdirs@'; \
        target=`echo $@`; \
        for subdir in $$list; do \
@@ -38,7 +45,7 @@ install:
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done
 
-clean: 
+old_clean: 
        @list='@subdirs@'; \
        target=`echo $@`; \
        for subdir in $$list; do \
@@ -53,7 +60,7 @@ clean:
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done
 
-distclean: 
+old_distclean: 
        @list='@subdirs@'; \
        target=`echo $@`; \
        for subdir in $$list; do \
@@ -72,9 +79,12 @@ distclean:
 # distclean the associated packages and include them in the dist
 #
 
-dist-hook:
-       (cd $(top_srcdir); $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl)
-       tar cf - simgear/metar | (cd $(distdir); tar xvf -)
+old_dist-hook:
+       (cd $(top_srcdir); \
+               $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl --lib)
+       pwd
+       echo "copying simgear/metar"
+       echo "other stuff"
        @list='@subdirs@'; \
        target=distclean; \
        for subdir in $$list; do \
@@ -88,13 +98,13 @@ dist-hook:
          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
           || case "$$amf" in *=*) echo "distclean error ignored...";; *k*) fail=yes;; *) echo "distclean error ignored...";; esac; \
        done
-       tar cf - simgear/metakit | (cd $(distdir); tar xvf -)
-       
+       (cd $(top_srcdir); tar cf - simgear/metakit) | \
+                (cd $(distdir); tar xvf -)
+
 
 #
 # Rule to build RPM distribution package
 #
 rpm: dist
-       cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/packages/SOURCES
-       rpm -ba @PACKAGE@.spec
+       rpm -ta $(PACKAGE)-$(VERSION).tar.gz