Changeset 1399Tweet

Timestamp:

11/14/06 21:14:38 (7 years ago)

Author:

sam

Message:

• Don't rely on pkg-config macros for variable substitution. Just in case.

Location:

libcaca/trunk

Files:

• caca/Makefile.am (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• tools/Makefile.am (modified) (1 diff)

libcaca/trunk/caca/Makefile.am

@@ -40 +40 @@
 libx11_plugin_la_SOURCES = driver_x11.c
 libx11_plugin_la_LDFLAGS = -no-undefined -module -no-version
-libx11_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la @X11_LIBS@
+libx11_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(X11_LIBS)
 
 libgl_plugin_la_SOURCES = driver_gl.c
 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)
 else
 extra_source = driver_x11.c driver_gl.c

libcaca/trunk/src/Makefile.am

@@ -18 +18 @@
 cacaview_SOURCES = cacaview.c common-image.c common-image.h
 cacaview_LDADD = ../caca/libcaca.la ../cucul/libcucul.la
-cacaview_CFLAGS = @IMLIB2_CFLAGS@
-cacaview_LDFLAGS = @IMLIB2_LIBS@
+cacaview_CFLAGS = $(IMLIB2_CFLAGS)
+cacaview_LDFLAGS = $(IMLIB2_LIBS)
 
 cacadraw_SOURCES = cacadraw.c
@@ -32 +32 @@
 img2irc_SOURCES = img2irc.c common-image.c common-image.h
 img2irc_LDADD = ../cucul/libcucul.la
-img2irc_CFLAGS = @IMLIB2_CFLAGS@
-img2irc_LDFLAGS = @IMLIB2_LIBS@
+img2irc_CFLAGS = $(IMLIB2_CFLAGS)
+img2irc_LDFLAGS = $(IMLIB2_LIBS)
 
 if USE_NETWORK

libcaca/trunk/tools/Makefile.am

@@ -9 +9 @@
 makefont_SOURCES = makefont.c
 makefont_LDADD = ../cucul/libcucul.la
-makefont_CFLAGS = @PANGOFT2_CFLAGS@
-makefont_LDFLAGS = @PANGOFT2_LIBS@
+makefont_CFLAGS = $(PANGOFT2_CFLAGS)
+makefont_LDFLAGS = $(PANGOFT2_LIBS)
 
 if USE_PANGO