- read all joystick files from $FG_ROOT/Input/Joysticks automatically

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

diff --git a/src/Input/Makefile.am b/src/Input/Makefile.am
index 49b2bcbd278add94ac33d9e28059dc7b93fbc11c..6671e74f09a4b15e5727684a6f003a84a2ee9a9e 100644 (file)
--- a/src/Input/Makefile.am
+++ b/src/Input/Makefile.am
@@ -2,15 +2,14 @@ noinst_LIBRARIES = libInput.a
 
 libInput_a_SOURCES = input.cxx input.hxx
 
-# bin_PROGRAMS = js_demo fgjs
-bin_PROGRAMS = js_demo
+bin_PROGRAMS = js_demo fgjs
 
 js_demo_SOURCES = js_demo.cxx
 
-js_demo_LDADD = $(audio_LIBS)
+js_demo_LDADD = -lplibjs $(base_LIBS) $(joystick_LIBS) -lplibul
 
-# fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
+fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
 
-# fgjs_LDADD = $(audio_LIBS)
+fgjs_LDADD = -lplibjs $(base_LIBS) $(joystick_LIBS) -lplibul
 
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src