1 --- libcaca-0.6/src/Makefile.am.orig 2004-01-04 00:21:39.000000000 +0100
2 +++ libcaca-0.6/src/Makefile.am 2004-01-04 21:08:38.888961680 +0100
5 include_HEADERS = caca.h
7 -lib_LIBRARIES = libcaca.a $(libcaca_pic_a)
9 +lib_LTLIBRARIES = libcaca.la
10 +libcaca_la_SOURCES = \
19 -libcaca_pic_a = libcaca_pic.a
21 -libcaca_pic_a_SOURCES = $(libcaca_a_SOURCES)
22 -libcaca_pic_a_CPPFLAGS = -fPIC -DPIC
24 +libcaca_la_LIBADD = $(CACA_LIBS)
25 --- libcaca-0.6/examples/Makefile.am.orig 2004-01-04 00:21:40.000000000 +0100
26 +++ libcaca-0.6/examples/Makefile.am 2004-01-04 21:09:04.635047680 +0100
28 bin_PROGRAMS = cacademo cacafire caca-spritedit cacaview
30 cacademo_SOURCES = demo.c
31 -cacademo_LDADD = ../src/libcaca.a @CACA_LIBS@ -lm
32 +cacademo_LDADD = ../src/libcaca.la @CACA_LIBS@ -lm
33 cacademo_CPPFLAGS = -I$(top_srcdir)/src -DDATADIR=\"$(pkgdatadir)\"
35 cacafire_SOURCES = aafire.c
36 -cacafire_LDADD = ../src/libcaca.a @CACA_LIBS@
37 +cacafire_LDADD = ../src/libcaca.la @CACA_LIBS@
38 cacafire_CPPFLAGS = -I$(top_srcdir)/src -DLIBCACA=1
40 caca_spritedit_SOURCES = spritedit.c
41 -caca_spritedit_LDADD = ../src/libcaca.a @CACA_LIBS@
42 +caca_spritedit_LDADD = ../src/libcaca.la @CACA_LIBS@
43 caca_spritedit_CPPFLAGS = -I$(top_srcdir)/src
45 cacaview_SOURCES = cacaview.c
46 -cacaview_LDADD = ../src/libcaca.a @CACA_LIBS@
47 +cacaview_LDADD = ../src/libcaca.la @CACA_LIBS@
48 cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1
50 cacaview_CFLAGS = `imlib2-config --cflags`
51 --- libcaca-0.6/test/Makefile.am.orig 2004-01-04 00:21:38.000000000 +0100
52 +++ libcaca-0.6/test/Makefile.am 2004-01-04 21:09:19.210831824 +0100
54 noinst_PROGRAMS = dithering hsv optipal
56 dithering_SOURCES = dithering.c
57 -dithering_LDADD = ../src/libcaca.a @CACA_LIBS@
58 +dithering_LDADD = ../src/libcaca.la @CACA_LIBS@
59 dithering_CPPFLAGS = -I$(top_srcdir)/src
62 -hsv_LDADD = ../src/libcaca.a @CACA_LIBS@
63 +hsv_LDADD = ../src/libcaca.la @CACA_LIBS@
64 hsv_CPPFLAGS = -I$(top_srcdir)/src
66 optipal_SOURCES = optipal.c
67 -optipal_LDADD = ../src/libcaca.a @CACA_LIBS@
68 +optipal_LDADD = ../src/libcaca.la @CACA_LIBS@
69 optipal_CPPFLAGS = -I$(top_srcdir)/src
71 --- libcaca-0.6/configure.ac.orig 2004-01-04 00:21:39.000000000 +0100
72 +++ libcaca-0.6/configure.ac 2004-01-04 21:07:06.773965288 +0100
80 dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
81 dnl now otherwise it might be set in an obscure if statement.
86 -CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
87 +CFLAGS="${CFLAGS} -fno-strength-reduce"
88 # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
89 CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
91 -# Build the PIC library?
92 -case "${target_os}" in
93 - *mingw32* | *cygwin* | *djgpp*)
100 -AM_CONDITIONAL(NEED_PIC, ${NEED_PIC})
103 ac_cv_my_have_imlib2="no"
104 AC_ARG_ENABLE(imlib2,
105 --- libcaca-0.6/caca-config.in.orig 2004-01-04 00:21:39.000000000 +0100
106 +++ libcaca-0.6/caca-config.in 2004-01-04 22:05:40.492798832 +0100
111 -@NEED_PIC_TRUE@ --libs)
112 -@NEED_PIC_FALSE@ --libs | --plugin-libs)
113 + --libs | --plugin-libs)
116 -@NEED_PIC_TRUE@ --plugin-libs)
117 -@NEED_PIC_TRUE@ echo_plugin_libs=yes
124 echo -L@libdir@ -lcaca @CACA_LIBS@
127 -@NEED_PIC_TRUE@if test "$echo_plugin_libs" = "yes"
129 -@NEED_PIC_TRUE@ echo -L@libdir@ -lcaca_pic @CACA_LIBS@