X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FMakefile.am;h=7134ac90f4e7b897e22e775b902fac89e8be4dc6;hb=164f40e04e857b4edd4f58427cae44ceb85dbce0;hp=6093d38ebcdb702bba2e440cb2a1ac39248d8ee0;hpb=8b00b2e551e44ce20aa43c794d87022549cbfbb0;p=freeglut

diff --git a/src/Makefile.am b/src/Makefile.am
index 6093d38..7134ac9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,17 +3,18 @@
 #
 # The library we want to build
 #
-lib_LTLIBRARIES = libglut.la
+lib_LTLIBRARIES = lib@LIBRARY@.la
 
 noinst_HEADERS = freeglut_internal.h
 #
 # Those source files build the freeglut library
 #
-libglut_la_SOURCES = freeglut_callbacks.c \
+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 \
@@ -34,8 +35,9 @@ libglut_la_SOURCES = freeglut_callbacks.c \
 #
 # Additional linker flags
 #	 
-libglut_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 -lXxf86vm
-libglut_la_LDFLAGS = -version-info 11:0:8
+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)
 
 #
 # End of file