f9a5f921a4
Resolving merge conflicts indicated below. Conflicts: src/ATC/CMakeLists.txt src/ATC/Makefile.am src/Main/fg_init.cxx
9 lines
235 B
Makefile
9 lines
235 B
Makefile
noinst_LIBRARIES = libATC.a
|
|
|
|
libATC_a_SOURCES = \
|
|
atcdialog.cxx atcdialog.hxx \
|
|
atc_mgr.cxx atc_mgr.hxx \
|
|
CommStation.cxx CommStation.hxx \
|
|
trafficcontrol.cxx trafficcontrol.hxx
|
|
|
|
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
|