X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Makefile.am;h=309596aadf4fcb69345ee35e1fe1e9f2214cffcf;hb=b496593883376e45c9c011d42602482a472a2077;hp=b32b8a611123e92489523662bce59407812ff073;hpb=b82e02b5edc513a1cac38efb95f070d7d1f83520;p=simgear.git

diff --git a/Makefile.am b/Makefile.am
index b32b8a61..309596aa 100644
--- 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,12 +79,11 @@ distclean:
 # distclean the associated packages and include them in the dist
 #
 
-dist-hook:
+old_dist-hook:
 	(cd $(top_srcdir); \
 		$(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl --lib)
 	pwd
 	echo "copying simgear/metar"
-	(cd $(top_srcdir); tar cf - simgear/metar) | (cd $(distdir); tar xvf -)
 	echo "other stuff"
 	@list='@subdirs@'; \
 	target=distclean; \
@@ -94,12 +100,11 @@ dist-hook:
 	done
 	(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