projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully removed all damage done by commits without merge
[freeglut]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
00bf384
..
188395d
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-3,16
+3,24
@@
#
# The library we want to build
#
#
# The library we want to build
#
-lib_LTLIBRARIES = libfreeglut.la
+lib_LTLIBRARIES = lib@LIBRARY@.la
+
+#
+# Headers and extra stuff we want to distribute
+#
+noinst_HEADERS = freeglut_internal.h freeglut_teapot_data.h
+
+EXTRA_DIST = freeglutdll.def
#
# Those source files build the freeglut library
#
#
# Those source files build the freeglut library
#
-libfreeglut_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_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_font_data.c \
freeglut_stroke_roman.c \
freeglut_stroke_mono_roman.c \
@@
-30,12
+38,14
@@
libfreeglut_la_SOURCES = freeglut_callbacks.c \
freeglut_videoresize.c \
freeglut_window.c
freeglut_videoresize.c \
freeglut_window.c
-
#
# Additional linker flags
#
#
# Additional linker flags
#
-libfreeglut_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 -lXxf86vm
-libfreeglut_la_LDFLAGS = -version-info 2:0:0
+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../include
#
# End of file
#
# End of file