X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FMakefile.am;h=893626c2c4ab809d38fee987e62956c02bf1bad5;hb=76abafb9109bfc14c93c9f86574b7a1ce1dae957;hp=93195ded625df07cdd6564a13e17c608adf4bd32;hpb=09070646b28804f0a700bd10b6caf8d606712d2c;p=freeglut

diff --git a/src/Makefile.am b/src/Makefile.am
index 93195de..893626c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,45 +8,60 @@ lib_LTLIBRARIES = lib@LIBRARY@.la
 #
 # Headers and extra stuff we want to distribute
 #
-noinst_HEADERS = freeglut_internal.h freeglut_teapot_data.h
+noinst_HEADERS = Common/freeglut_internal.h Common/freeglut_teapot_data.h
 
 EXTRA_DIST = freeglutdll.def
 
 #
 # Those source files build the freeglut library
 #
-lib@LIBRARY@_la_SOURCES = freeglut_callbacks.c \
-			 freeglut_cursor.c \
-			 freeglut_display.c \
-			 freeglut_ext.c \
-			 freeglut_font.c \
-			 freeglut_glutfont_definitions.c \
-			 freeglut_font_data.c \
-			 freeglut_stroke_roman.c \
-			 freeglut_stroke_mono_roman.c \
-			 freeglut_gamemode.c \
-			 freeglut_geometry.c \
-			 freeglut_init.c \
-			 freeglut_input_devices.c \
-			 freeglut_joystick.c \
-			 freeglut_main.c \
-			 freeglut_menu.c \
-			 freeglut_misc.c \
-			 freeglut_overlay.c \
-			 freeglut_state.c \
-			 freeglut_structure.c \
-			 freeglut_teapot.c \
-			 freeglut_videoresize.c \
-			 freeglut_window.c
+lib@LIBRARY@_la_SOURCES = Common/freeglut_callbacks.c \
+			 Common/freeglut_cursor.c \
+			 Common/freeglut_display.c \
+			 Common/freeglut_ext.c \
+			 Common/freeglut_font.c \
+			 Common/freeglut_glutfont_definitions.c \
+			 Common/freeglut_font_data.c \
+			 Common/freeglut_stroke_roman.c \
+			 Common/freeglut_stroke_mono_roman.c \
+			 Common/freeglut_gamemode.c \
+			 Common/freeglut_geometry.c \
+			 Common/freeglut_init.c \
+			 Common/freeglut_input_devices.c \
+			 Common/freeglut_spaceball.c \
+			 Common/freeglut_joystick.c \
+			 Common/freeglut_main.c \
+			 Common/freeglut_menu.c \
+			 Common/freeglut_misc.c \
+			 Common/freeglut_overlay.c \
+			 Common/freeglut_state.c \
+			 Common/freeglut_structure.c \
+			 Common/freeglut_teapot.c \
+			 Common/freeglut_videoresize.c \
+			 Common/freeglut_window.c \
+			 x11/freeglut_cursor_x11.c \
+			 x11/freeglut_display_x11.c \
+			 x11/freeglut_ext_x11.c \
+			 x11/freeglut_gamemode_x11.c \
+			 x11/freeglut_glutfont_definitions_x11.c \
+			 x11/freeglut_init_x11.c \
+			 x11/freeglut_input_devices_x11.c \
+			 x11/freeglut_joystick_x11.c \
+			 x11/freeglut_main_x11.c \
+			 x11/freeglut_menu_x11.c \
+			 x11/freeglut_spaceball_x11.c \
+			 x11/freeglut_state_x11.c \
+			 x11/freeglut_structure_x11.c \
+			 x11/freeglut_window_x11.c \
+			 x11/freeglut_xinput_x11.c
 
 #
 # Additional linker flags
 #	 
-lib@LIBRARY@_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM)
-lib@LIBRARY@_la_LDFLAGS = -version-info 11:0:8
-lib@LIBRARY@_la_CFLAGS = $(X_CFLAGS)
-
-INCLUDES = -I$(top_srcdir)/include
+lib@LIBRARY@_la_LIBADD  = $(GL_LIBS) $(X_LIBS) $(LIBM) $(LIBUSBHID)
+lib@LIBRARY@_la_LDFLAGS = $(VERSION_INFO) -no-undefined
+lib@LIBRARY@_la_CFLAGS  = $(GL_FLAGS) $(X_CFLAGS) $(EXPORT_FLAGS)
+lib@LIBRARY@_la_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/src/Common
 
 #
 # End of file