X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Makefile.am;h=aac4221ef68f94f4fe973685fa4549a7a57f3379;hb=116a6c1b2e02b583c9b8f677a3664410ad84e809;hp=82f4c1608ce1efd6cc24c5deadf32b33daa663fc;hpb=36ef15940e6f77892c1d15e636e157628cf1b59e;p=simgear.git

diff --git a/Makefile.am b/Makefile.am
index 82f4c160..aac4221e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,104 +1,23 @@
-EXTRA_DIST	= mksymlinks.sh acsite.m4 acconfig.h SimGear.dsp SimGear.dsw
-
-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
-#
-
-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
-
-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
-
-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
-
-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
-#
+EXTRA_DIST = \
+	acinclude.m4 \
+	autogen.sh \
+	DoxygenMain.cxx \
+	README.MSVC \
+	README.zlib \
+	README.plib \
+	README.OpenAL \
+	README.OSG \
+	projects
+
+SUBDIRS	= simgear
 
 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 -)
-	
+	(cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
+	rm -rf `find $(distdir)/projects -name CVS`
 
 #
 # 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