1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
|
diff -ru libcaca-0.9.old/caca-config.in libcaca-0.9/caca-config.in
--- libcaca-0.9.old/caca-config.in 2004-02-02 04:00:20.000000000 +0100
+++ libcaca-0.9/caca-config.in 2004-09-28 00:02:01.950094712 +0200
@@ -63,13 +63,9 @@
--ldflags)
echo_ldflags=yes
;;
-@NEED_PIC_TRUE@ --libs)
-@NEED_PIC_FALSE@ --libs | --plugin-libs)
+ --libs | --plugin-libs)
echo_libs=yes
;;
-@NEED_PIC_TRUE@ --plugin-libs)
-@NEED_PIC_TRUE@ echo_plugin_libs=yes
-@NEED_PIC_TRUE@ ;;
*)
usage 1 1>&2
;;
@@ -111,9 +107,3 @@
then
echo -L@libdir@ -lcaca @CACA_LIBS@
fi
-
-@NEED_PIC_TRUE@if test "$echo_plugin_libs" = "yes"
-@NEED_PIC_TRUE@then
-@NEED_PIC_TRUE@ echo -L@libdir@ -lcaca_pic @CACA_LIBS@
-@NEED_PIC_TRUE@fi
-
diff -ru libcaca-0.9.old/configure.ac libcaca-0.9/configure.ac
--- libcaca-0.9.old/configure.ac 2004-09-28 00:01:20.092458040 +0200
+++ libcaca-0.9/configure.ac 2004-09-27 23:59:22.013408784 +0200
@@ -11,7 +11,7 @@
AM_PROG_CC_C_O
AC_PROG_CPP
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_C_CONST
AC_C_INLINE
diff -ru libcaca-0.9.old/examples/Makefile.am libcaca-0.9/examples/Makefile.am
--- libcaca-0.9.old/examples/Makefile.am 2004-09-28 00:01:20.093457888 +0200
+++ libcaca-0.9/examples/Makefile.am 2004-09-27 23:59:22.013408784 +0200
@@ -7,27 +7,27 @@
bin_PROGRAMS = cacademo cacafire cacaball cacaplas cacaview cacamoir
cacademo_SOURCES = demo.c
-cacademo_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
+cacademo_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@ @MATH_LIBS@
cacademo_CPPFLAGS = -I$(top_srcdir)/src -DDATADIR=\"$(pkgdatadir)\"
cacafire_SOURCES = aafire.c
-cacafire_LDADD = ../src/libcaca.a @CACA_LIBS@
+cacafire_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
cacafire_CPPFLAGS = -I$(top_srcdir)/src -DLIBCACA=1
cacaball_SOURCES = cacaball.c
-cacaball_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
+cacaball_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@ @MATH_LIBS@
cacaball_CPPFLAGS = -I$(top_srcdir)/src
cacaplas_SOURCES = cacaplas.c
-cacaplas_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
+cacaplas_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@ @MATH_LIBS@
cacaplas_CPPFLAGS = -I$(top_srcdir)/src
cacamoir_SOURCES = cacamoir.c
-cacamoir_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
+cacamoir_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@ @MATH_LIBS@
cacamoir_CPPFLAGS = -I$(top_srcdir)/src
cacaview_SOURCES = cacaview.c
-cacaview_LDADD = ../src/libcaca.a @CACA_LIBS@
+cacaview_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1
if USE_IMLIB2
cacaview_CFLAGS = `imlib2-config --cflags`
diff -ru libcaca-0.9.old/src/Makefile.am libcaca-0.9/src/Makefile.am
--- libcaca-0.9.old/src/Makefile.am 2004-09-28 00:01:20.094457736 +0200
+++ libcaca-0.9/src/Makefile.am 2004-09-27 23:59:22.013408784 +0200
@@ -2,8 +2,9 @@
include_HEADERS = caca.h
-lib_LIBRARIES = libcaca.a $(libcaca_pic_a)
-libcaca_a_SOURCES = \
+lib_LTLIBRARIES = libcaca.la
+libcaca_la_LDFLAGS = -version-info 0:9:0
+libcaca_la_SOURCES = \
caca.c \
caca.h \
caca_internals.h \
@@ -18,10 +19,3 @@
bitmap.c \
time.c \
$(NULL)
-
-if NEED_PIC
-libcaca_pic_a = libcaca_pic.a
-endif
-libcaca_pic_a_SOURCES = $(libcaca_a_SOURCES)
-libcaca_pic_a_CPPFLAGS = -fPIC -DPIC
-
diff -ru libcaca-0.9.old/test/Makefile.am libcaca-0.9/test/Makefile.am
--- libcaca-0.9.old/test/Makefile.am 2004-09-28 00:01:20.094457736 +0200
+++ libcaca-0.9/test/Makefile.am 2004-09-27 23:59:22.013408784 +0200
@@ -3,26 +3,26 @@
noinst_PROGRAMS = colors dithering event hsv optipal spritedit
colors_SOURCES = colors.c
-colors_LDADD = ../src/libcaca.a @CACA_LIBS@
+colors_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
colors_CPPFLAGS = -I$(top_srcdir)/src
dithering_SOURCES = dithering.c
-dithering_LDADD = ../src/libcaca.a @CACA_LIBS@
+dithering_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
dithering_CPPFLAGS = -I$(top_srcdir)/src
event_SOURCES = event.c
-event_LDADD = ../src/libcaca.a @CACA_LIBS@
+event_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
event_CPPFLAGS = -I$(top_srcdir)/src
hsv_SOURCES = hsv.c
-hsv_LDADD = ../src/libcaca.a @CACA_LIBS@
+hsv_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
hsv_CPPFLAGS = -I$(top_srcdir)/src
optipal_SOURCES = optipal.c
-optipal_LDADD = ../src/libcaca.a @CACA_LIBS@
+optipal_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
optipal_CPPFLAGS = -I$(top_srcdir)/src
spritedit_SOURCES = spritedit.c
-spritedit_LDADD = ../src/libcaca.a @CACA_LIBS@
+spritedit_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
spritedit_CPPFLAGS = -I$(top_srcdir)/src
|
GitWeb