-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$(top_builddir) -I$(top_builddir)/Simulator
+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