Moved max node per tile definition to fg_constants.h

[flightgear.git] / Joystick / Makefile.am

diff --git a/Joystick/Makefile.am b/Joystick/Makefile.am
index d01f0b0f659e1ac6a4da0c748ee90145291c884e..416b40d674a2c7f003a02d350f1f04213685b3bb 100644 (file)
--- a/Joystick/Makefile.am
+++ b/Joystick/Makefile.am
@@ -1,7 +1,16 @@
-libdir = ${exec_prefix}/lib
+if ENABLE_LINUX_JOYSTICK
+DEFS += -DENABLE_LINUX_JOYSTICK
+else
+DEFS += -DENABLE_GLUT_JOYSTICK
+endif
 
-lib_LTLIBRARIES = libJoystick.la
+EXTRA_DIST = js.cxx
 
-libJoystick_la_SOURCES = joystick.c joystick.h
+noinst_LIBRARIES = libJoystick.a
 
-INCLUDES += -I..
+libJoystick_a_SOURCES = joystick.cxx joystick.hxx js.hxx
+
+INCLUDES += -I$(top_builddir) \
+       -I$(top_builddir)/Lib \
+       -I$(top_builddir)/Lib/plib/include \
+       -I$(top_builddir)/Simulator