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

[flightgear.git] / src / ATC / Makefile.am

diff --git a/src/ATC/Makefile.am b/src/ATC/Makefile.am
index 20424a7752146d59a4499be5ead5881c32ed92ef..8748cef1e7fac019c3f64950b083c8831188eefe 100644 (file)
--- a/src/ATC/Makefile.am
+++ b/src/ATC/Makefile.am
@@ -1,31 +1,8 @@
 noinst_LIBRARIES = libATC.a
 
-if USE_FESTIVAL
-VOICE_SRC = voice.cxx voice.hxx
-else
-VOICE_SRC =
-endif
-
 libATC_a_SOURCES = \
-       ATC.hxx ATC.cxx \
-       atis.hxx atis.cxx \
-       tower.hxx tower.cxx \
-       approach.hxx approach.cxx \
-       ground.hxx ground.cxx \
-       commlist.hxx commlist.cxx \
-       ATCDialog.hxx ATCDialog.cxx \
-       ATCdisplay.hxx ATCdisplay.cxx \
-       ATCVoice.hxx ATCVoice.cxx \
-       ATCmgr.hxx ATCmgr.cxx \
-       ATCutils.hxx ATCutils.cxx \
-       ATCProjection.hxx ATCProjection.cxx \
-       AIMgr.hxx AIMgr.cxx \
-       AIEntity.hxx AIEntity.cxx \
-       AIPlane.hxx AIPlane.cxx \
-       AILocalTraffic.hxx AILocalTraffic.cxx \
-       AIGAVFRTraffic.hxx AIGAVFRTraffic.cxx \
-       transmission.hxx transmission.cxx \
-       transmissionlist.hxx transmissionlist.cxx \
-       $(VOICE_SRC)
+       atcutils.cxx atcutils.hxx \
+       atis.cxx atis.hxx \
+       trafficcontrol.cxx trafficcontrol.hxx 
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src