Changeset 1399


Ignore:
Timestamp:
Nov 14, 2006, 9:14:38 PM (14 years ago)
Author:
Sam Hocevar
Message:
  • Don't rely on pkg-config macros for variable substitution. Just in case.
Location:
libcaca/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/caca/Makefile.am

    r1396 r1399  
    4040libx11_plugin_la_SOURCES = driver_x11.c
    4141libx11_plugin_la_LDFLAGS = -no-undefined -module -no-version
    42 libx11_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la @X11_LIBS@
     42libx11_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(X11_LIBS)
    4343
    4444libgl_plugin_la_SOURCES = driver_gl.c
    4545libgl_plugin_la_LDFLAGS = -no-undefined -module -no-version
    46 libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la @GL_LIBS@
     46libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(GL_LIBS)
    4747else
    4848extra_source = driver_x11.c driver_gl.c
  • libcaca/trunk/src/Makefile.am

    r1300 r1399  
    1818cacaview_SOURCES = cacaview.c common-image.c common-image.h
    1919cacaview_LDADD = ../caca/libcaca.la ../cucul/libcucul.la
    20 cacaview_CFLAGS = @IMLIB2_CFLAGS@
    21 cacaview_LDFLAGS = @IMLIB2_LIBS@
     20cacaview_CFLAGS = $(IMLIB2_CFLAGS)
     21cacaview_LDFLAGS = $(IMLIB2_LIBS)
    2222
    2323cacadraw_SOURCES = cacadraw.c
     
    3232img2irc_SOURCES = img2irc.c common-image.c common-image.h
    3333img2irc_LDADD = ../cucul/libcucul.la
    34 img2irc_CFLAGS = @IMLIB2_CFLAGS@
    35 img2irc_LDFLAGS = @IMLIB2_LIBS@
     34img2irc_CFLAGS = $(IMLIB2_CFLAGS)
     35img2irc_LDFLAGS = $(IMLIB2_LIBS)
    3636
    3737if USE_NETWORK
  • libcaca/trunk/tools/Makefile.am

    r1212 r1399  
    99makefont_SOURCES = makefont.c
    1010makefont_LDADD = ../cucul/libcucul.la
    11 makefont_CFLAGS = @PANGOFT2_CFLAGS@
    12 makefont_LDFLAGS = @PANGOFT2_LIBS@
     11makefont_CFLAGS = $(PANGOFT2_CFLAGS)
     12makefont_LDFLAGS = $(PANGOFT2_LIBS)
    1313
    1414if USE_PANGO
Note: See TracChangeset for help on using the changeset viewer.