Changeset 2517 for libcaca/trunk/cacaTweet

Timestamp:

Jul 5, 2008, 6:28:30 PM (11 years ago)

Author:

Sam Hocevar

Message:

• Check for FTGL in the configure step, because we will use it later.
• Better CFLAGS and LDFLAGS propagation to the Makefiles.

File:

• libcaca/trunk/caca/Makefile.am (modified) (2 diffs)

libcaca/trunk/caca/Makefile.am

@@ -32 +32 @@
         $(extra_source) \
         $(NULL)
+libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@
 libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
 libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@
@@ -40 +41 @@
 
 libx11_plugin_la_SOURCES = driver_x11.c
+libx11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
 libx11_plugin_la_LDFLAGS = -no-undefined -module -no-version
 libx11_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(X11_LIBS)
 
 libgl_plugin_la_SOURCES = driver_gl.c
+libgl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GL_CFLAGS) #$(FTGL_CFLAGS)
 libgl_plugin_la_LDFLAGS = -no-undefined -module -no-version
-libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(GL_LIBS)
+libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(GL_LIBS) #$(FTGL_LIBS)
 else
 extra_source = driver_x11.c driver_gl.c