Fixed a problem with autodetecting if we need to draw our own mouse cursor

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index e487656dbcbb2e8faedeed0ef54781bb4012bd0d..7fb27f5e27e7752ba3c40072527dbe4524052cf0 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -20,7 +20,7 @@ NETWORK_LIBS = \
 endif
 
 if OLD_AUTOMAKE
-CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
+# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
 else
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
 endif
@@ -29,19 +29,25 @@ EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
 bin_PROGRAMS = fgfs
 
-bin_SCRIPTS = runfgfs runfgfs.bat
+noinst_SCRIPTS = runfgfs runfgfs.bat
+
+bin_SCRIPTS = runfgfs
 
 fgfs_SOURCES = \
        main.cxx \
        bfi.cxx bfi.hxx \
        fg_init.cxx fg_init.hxx \
        fg_io.cxx fg_io.hxx \
+       fg_props.cxx fg_props.hxx \
+        fgfs.cxx fgfs.hxx \
        globals.cxx globals.hxx \
        keyboard.cxx keyboard.hxx \
        options.cxx options.hxx \
-       save.cxx save.hxx \
        splash.cxx splash.hxx \
-       views.cxx views.hxx
+       viewer.cxx viewer.hxx \
+       viewer_lookat.cxx viewer_lookat.hxx \
+       viewer_rph.cxx viewer_rph.hxx \
+       viewmgr.cxx viewmgr.hxx
 
 fgfs_LDADD = \
        $(top_builddir)/src/Aircraft/libAircraft.a \
@@ -63,12 +69,12 @@ fgfs_LDADD = \
        $(top_builddir)/src/Time/libTime.a \
        $(WEATHER_LIBS) \
        $(top_builddir)/src/Joystick/libJoystick.a \
-       -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket \
-       -lsgdebug -lsgmagvar -lsgmisc \
+       -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen -lsgmath \
+       -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
        $(SERIAL_LIBS) \
        -lplibpu -lplibfnt -lplibssg -lplibsg \
        -lmk4 -lz \
        $(opengl_LIBS) \
        $(audio_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src