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

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

diff --git a/src/Airports/Makefile.am b/src/Airports/Makefile.am
index 33effd4cfaa4cb5a41113603c4a2538c0aa713b8..fa982678f39bd01a51e1ae660a288396b8b72995 100644 (file)
--- a/src/Airports/Makefile.am
+++ b/src/Airports/Makefile.am
@@ -1,19 +1,24 @@
 noinst_LIBRARIES = libAirports.a
 
-noinst_PROGRAMS = gensimple genrunways
+noinst_PROGRAMS = calc_loc
 
 libAirports_a_SOURCES = \
+       apt_loader.cxx apt_loader.hxx \
        runways.cxx runways.hxx \
-       simple.cxx simple.hxx
+       simple.cxx simple.hxx \
+       runwayprefs.cxx runwayprefs.hxx \
+       parking.cxx parking.hxx \
+       gnnode.cxx gnnode.hxx \
+       groundnetwork.cxx groundnetwork.hxx \
+       dynamics.cxx dynamics.hxx \
+       dynamicloader.cxx dynamicloader.hxx \
+       sidstar.cxx sidstar.hxx \
+       runwayprefloader.cxx runwayprefloader.hxx \
+       xmlloader.cxx xmlloader.hxx \
+       runwaybase.cxx runwaybase.hxx \
+       pavement.cxx pavement.hxx
+       
+calc_loc_SOURCES = calc_loc.cxx
+calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lsgstructure -lz $(base_LIBS)
 
-gensimple_SOURCES = gensimple.cxx
-gensimple_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz
-
-genrunways_SOURCES = genrunways.cxx
-genrunways_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz
-
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif