Minor clean ups.

diff --git a/Makefile.am b/Makefile.am
index 309596aadf4fcb69345ee35e1fe1e9f2214cffcf..794ab1a3523b65c4a2105b634cd8cf358a873133 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,99 +9,6 @@ EXTRA_DIST = \
 
 SUBDIRS        = simgear
 
-#
-# Additional all, clean, and distclean rules for additional packages.
-# We can't just include the additional package dirs in SUBDIRS (which 
-# would be nice because there are then problems with make dist
-#
-
-old_all: 
-       @list='@subdirs@'; \
-       target=`echo $@`; \
-       for subdir in $$list; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           dot_seen=yes; \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-       done
-
-old_install: 
-       @list='@subdirs@'; \
-       target=`echo $@`; \
-       for subdir in $$list; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           dot_seen=yes; \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-       done
-
-old_clean: 
-       @list='@subdirs@'; \
-       target=`echo $@`; \
-       for subdir in $$list; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           dot_seen=yes; \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-       done
-
-old_distclean: 
-       @list='@subdirs@'; \
-       target=`echo $@`; \
-       for subdir in $$list; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           dot_seen=yes; \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-       done
-
-#
-# distclean the associated packages and include them in the dist
-#
-
-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 \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           dot_seen=yes; \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-          || case "$$amf" in *=*) echo "distclean error ignored...";; *k*) fail=yes;; *) echo "distclean error ignored...";; esac; \
-       done
-       (cd $(top_srcdir); tar cf - simgear/metakit) | \
-                (cd $(distdir); tar xvf -)
-
-
 #
 # Rule to build RPM distribution package
 #

diff --git a/autogen.sh b/autogen.sh
index 06c2f96cbfb7e3dbff82984d434f6024f9e7f00b..7417a30021027373e5e2112782d1e8395cc4d76c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,8 +3,6 @@
 OSTYPE=`uname -s`
 MACHINE=`uname -m`
 AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\-p[0-9]$//' | sed -e 's/\.//'`
-# AM_CONDITIONAL(ANCIENT_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 14)
-# AM_CONDITIONAL(OLD_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 15)
 
 echo "Host info: $OSTYPE $MACHINE"
 echo -n " automake: `automake --version | head -1 | awk '{print $4}'`"