Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 72aa7dffbdf8b48384af7c1ebdc892639cc355e1..39b081ac151c84d4530f78af7f9d545778c94321 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,32 @@
-libdir = ${exec_prefix}/lib
+if ENABLE_ATCDCL
+ATCDCL_DIR = ATCDCL
+else
+ATCDCL_DIR = 
+endif
 
-lib_LTLIBRARIES = libsl.la libsm.la
 
-libsl_la_SOURCES = \
-       sl.h slPortability.h \
-       slDSP.cxx slSample.cxx slEnvelope.cxx \
-       slSamplePlayer.cxx slScheduler.cxx
-
-libsm_la_SOURCES = sm.h slPortability.h smMixer.cxx
-
-INCLUDES += -I$(top_builddir) -I.
+SUBDIRS = \
+        Include \
+        Aircraft \
+        Airports \
+       ATC \
+        $(ATCDCL_DIR) \
+        Autopilot \
+        Cockpit \
+        Environment \
+        FDM \
+        GUI \
+        Input \
+       Instrumentation \
+        Model \
+       AIModel \
+        Navaids \
+        Network \
+       MultiPlayer \
+        Scenery \
+       Scripting \
+        Sound \
+        Systems \
+        Time \
+       Traffic \
+        Main