Moved includes higher to make sure that std::sort is known.

[simgear.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6311c94653f5fd0e16685b0555553f93442b4648..686b138bc9e03235ab6ae64672dc1ec1d96b733e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,32 +1,19 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
-else
-SERIAL_DIRS =
-endif
+EXTRA_DIST = \
+       acsite.m4 \
+       acconfig.h \
+       mksymlinks.sh \
+       README.metakit \
+       README.zlib \
+       SimGear.dsp \
+       SimGear.dsw \
+       metakit-2.4.2-32.tar.gz \
+       zlib-1.1.4.tar.gz
 
-if HAVE_ZLIB
-ZLIB_DIRS =
-else
-ZLIB_DIRS = zlib
-endif
+SUBDIRS        = simgear
 
-METAR_DIRS =
-# METAR_DIRS = metar
-
-EXTRA_DIST = mksymlinks.sh
-
-dist-hook:
-       tar cf - metar | (cd $(distdir); tar xvf -)
-
-SUBDIRS = \
-       include \
-       bucket \
-       debug \
-       math \
-       $(METAR_DIRS) \
-       misc \
-       screen \
-       $(SERIAL_DIRS) \
-       xgl \
-       $(ZLIB_DIRS)
+#
+# Rule to build RPM distribution package
+#
+rpm: dist
+       rpm -ta $(PACKAGE)-$(VERSION).tar.gz