Browse Source

* Workaround for automake < 1.6.

tags/v0.99.beta14
Sam Hocevar sam 19 years ago
parent
commit
d660aa1390
3 changed files with 4 additions and 17 deletions
  1. +1
    -1
      caca/Makefile.am
  2. +1
    -5
      src/Makefile.am
  3. +2
    -11
      test/Makefile.am

+ 1
- 1
caca/Makefile.am View File

@@ -20,7 +20,7 @@ libcaca_la_SOURCES = \
driver_win32.c \ driver_win32.c \
driver_x11.c \ driver_x11.c \
$(NULL) $(NULL)
libcaca_la_CPPFLAGS = -I$(top_srcdir)/cucul
AM_CPPFLAGS = -I$(top_srcdir)/cucul
libcaca_la_LDFLAGS = -no-undefined libcaca_la_LDFLAGS = -no-undefined
libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@ libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@



+ 1
- 5
src/Makefile.am View File

@@ -3,28 +3,24 @@
pkgdata_DATA = caca.txt pkgdata_DATA = caca.txt


EXTRA_DIST = caca.txt EXTRA_DIST = caca.txt
AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1


bin_PROGRAMS = cacafire cacaball cacaplas cacaview cacamoir bin_PROGRAMS = cacafire cacaball cacaplas cacaview cacamoir


cacafire_SOURCES = aafire.c cacafire_SOURCES = aafire.c
cacafire_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ cacafire_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
cacafire_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DLIBCACA=1


cacaball_SOURCES = cacaball.c cacaball_SOURCES = cacaball.c
cacaball_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@ cacaball_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
cacaball_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


cacaplas_SOURCES = cacaplas.c cacaplas_SOURCES = cacaplas.c
cacaplas_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@ cacaplas_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
cacaplas_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


cacamoir_SOURCES = cacamoir.c cacamoir_SOURCES = cacamoir.c
cacamoir_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@ cacamoir_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
cacamoir_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


cacaview_SOURCES = cacaview.c cacaview_SOURCES = cacaview.c
cacaview_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ cacaview_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
cacaview_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DX_DISPLAY_MISSING=1
if USE_IMLIB2 if USE_IMLIB2
cacaview_CFLAGS = `imlib2-config --cflags` cacaview_CFLAGS = `imlib2-config --cflags`
cacaview_LDFLAGS = `imlib2-config --libs` cacaview_LDFLAGS = `imlib2-config --libs`


+ 2
- 11
test/Makefile.am View File

@@ -1,48 +1,39 @@
# $Id$ # $Id$


AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"

noinst_PROGRAMS = colors demo dithering event export gamma hsv optipal spritedit transform unicode noinst_PROGRAMS = colors demo dithering event export gamma hsv optipal spritedit transform unicode


colors_SOURCES = colors.c colors_SOURCES = colors.c
colors_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ colors_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
colors_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


demo_SOURCES = demo.c demo_SOURCES = demo.c
demo_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@ demo_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
demo_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"


dithering_SOURCES = dithering.c dithering_SOURCES = dithering.c
dithering_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ dithering_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
dithering_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


event_SOURCES = event.c event_SOURCES = event.c
event_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ event_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
event_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


export_SOURCES = export.c export_SOURCES = export.c
export_LDADD = ../cucul/libcucul.la @CUCUL_LIBS@ export_LDADD = ../cucul/libcucul.la @CUCUL_LIBS@
export_CPPFLAGS = -I$(top_srcdir)/cucul


gamma_SOURCES = gamma.c gamma_SOURCES = gamma.c
gamma_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@ gamma_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
gamma_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


hsv_SOURCES = hsv.c hsv_SOURCES = hsv.c
hsv_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ hsv_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
hsv_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


optipal_SOURCES = optipal.c optipal_SOURCES = optipal.c
optipal_LDADD = ../cucul/libcucul.la @CUCUL_LIBS@ optipal_LDADD = ../cucul/libcucul.la @CUCUL_LIBS@
optipal_CPPFLAGS = -I$(top_srcdir)/cucul


spritedit_SOURCES = spritedit.c spritedit_SOURCES = spritedit.c
spritedit_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ spritedit_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
spritedit_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


transform_SOURCES = transform.c transform_SOURCES = transform.c
transform_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ transform_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
transform_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca


unicode_SOURCES = unicode.c unicode_SOURCES = unicode.c
unicode_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ unicode_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
unicode_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca



Loading…
Cancel
Save