From 91645bfa68af7df99347a843ec1e918a2ad623ec Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 20 Oct 2006 16:19:41 +0000 Subject: [PATCH] * Do not link binaries with @CACA_LIBS@, it's useless. --- cxx/Makefile.am | 2 +- src/Makefile.am | 15 ++++++++------- test/Makefile.am | 33 ++++++++++++++++++--------------- tools/Makefile.am | 4 ++-- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/cxx/Makefile.am b/cxx/Makefile.am index 8e1733f..b298f68 100644 --- a/cxx/Makefile.am +++ b/cxx/Makefile.am @@ -20,5 +20,5 @@ noinst_PROGRAMS = cxxtest endif cxxtest_SOURCES = cxxtest.cpp -cxxtest_LDADD = libcaca++.la libcucul++.la ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +cxxtest_LDADD = libcaca++.la libcucul++.la ../caca/libcaca.la ../cucul/libcucul.la diff --git a/src/Makefile.am b/src/Makefile.am index f404062..e39d8e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,27 +9,28 @@ bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2irc $(fcntl_programs) noinst_PROGRAMS = cacadraw cacademo_SOURCES = cacademo.c -cacademo_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@ +cacademo_LDADD = ../caca/libcaca.la ../cucul/libcucul.la +cacademo_LDFLAGS = @MATH_LIBS@ cacafire_SOURCES = aafire.c -cacafire_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +cacafire_LDADD = ../caca/libcaca.la ../cucul/libcucul.la cacaview_SOURCES = cacaview.c common-image.c common-image.h -cacaview_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +cacaview_LDADD = ../caca/libcaca.la ../cucul/libcucul.la cacaview_CFLAGS = @IMLIB2_CFLAGS@ cacaview_LDFLAGS = @IMLIB2_LIBS@ cacadraw_SOURCES = cacadraw.c -cacadraw_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +cacadraw_LDADD = ../caca/libcaca.la ../cucul/libcucul.la cacaplay_SOURCES = cacaplay.c -cacaplay_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +cacaplay_LDADD = ../caca/libcaca.la ../cucul/libcucul.la cacaserver_SOURCES = cacaserver.c -cacaserver_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +cacaserver_LDADD = ../caca/libcaca.la ../cucul/libcucul.la img2irc_SOURCES = img2irc.c common-image.c common-image.h -img2irc_LDADD = ../cucul/libcucul.la @CACA_LIBS@ +img2irc_LDADD = ../cucul/libcucul.la img2irc_CFLAGS = @IMLIB2_CFLAGS@ img2irc_LDFLAGS = @IMLIB2_LIBS@ diff --git a/test/Makefile.am b/test/Makefile.am index 2f9e31a..ce11c1a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -5,55 +5,58 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATAD noinst_PROGRAMS = colors demo demo0 dithering event export font frames gamma hsv input spritedit font2tga text transform truecolor unicode import colors_SOURCES = colors.c -colors_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +colors_LDADD = ../caca/libcaca.la ../cucul/libcucul.la demo_SOURCES = demo.c -demo_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@ +demo_LDADD = ../caca/libcaca.la ../cucul/libcucul.la +demo_LDFLAGS = @MATH_LIBS@ demo0_SOURCES = demo0.c -demo0_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@ +demo0_LDADD = ../caca/libcaca.la ../cucul/libcucul.la +demo0_LDFLAGS = @MATH_LIBS@ dithering_SOURCES = dithering.c -dithering_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +dithering_LDADD = ../caca/libcaca.la ../cucul/libcucul.la event_SOURCES = event.c -event_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +event_LDADD = ../caca/libcaca.la ../cucul/libcucul.la export_SOURCES = export.c export_LDADD = ../cucul/libcucul.la font_SOURCES = font.c -font_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +font_LDADD = ../caca/libcaca.la ../cucul/libcucul.la font2tga_SOURCES = font2tga.c font2tga_LDADD = ../cucul/libcucul.la frames_SOURCES = frames.c -frames_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +frames_LDADD = ../caca/libcaca.la ../cucul/libcucul.la gamma_SOURCES = gamma.c -gamma_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@ +gamma_LDADD = ../caca/libcaca.la ../cucul/libcucul.la +gamma_LDFLAGS = @MATH_LIBS@ hsv_SOURCES = hsv.c -hsv_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +hsv_LDADD = ../caca/libcaca.la ../cucul/libcucul.la input_SOURCES = input.c -input_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +input_LDADD = ../caca/libcaca.la ../cucul/libcucul.la spritedit_SOURCES = spritedit.c -spritedit_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +spritedit_LDADD = ../caca/libcaca.la ../cucul/libcucul.la text_SOURCES = text.c text_LDADD = ../cucul/libcucul.la transform_SOURCES = transform.c -transform_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +transform_LDADD = ../caca/libcaca.la ../cucul/libcucul.la truecolor_SOURCES = truecolor.c -truecolor_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +truecolor_LDADD = ../caca/libcaca.la ../cucul/libcucul.la unicode_SOURCES = unicode.c -unicode_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +unicode_LDADD = ../caca/libcaca.la ../cucul/libcucul.la import_SOURCES = import.c -import_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ +import_LDADD = ../caca/libcaca.la ../cucul/libcucul.la diff --git a/tools/Makefile.am b/tools/Makefile.am index d69c378..47b54c0 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -7,9 +7,9 @@ noinst_PROGRAMS = optipal $(pango_programs) optipal_SOURCES = optipal.c makefont_SOURCES = makefont.c -makefont_CFLAGS = `pkg-config --cflags pangoft2` -makefont_LDFLAGS = `pkg-config --libs pangoft2` makefont_LDADD = ../cucul/libcucul.la +makefont_CFLAGS = @PANGOFT2_CFLAGS@ +makefont_LDFLAGS = @PANGOFT2_LIBS@ if USE_PANGO pango_programs = makefont