1 --- keeper-1.0/configure.in.orig Tue Feb 22 22:22:22 2000
2 +++ keeper-1.0/configure.in Wed May 7 15:49:41 2003
10 if test "x$cflags" = x; then
11 if test "$GCC" = yes; then
12 --- keeper-1.0/example/Makefile.in.orig Tue Feb 22 22:22:22 2000
13 +++ keeper-1.0/example/Makefile.in Wed May 7 15:46:28 2003
16 CPPFLAGS = @CPPFLAGS@ @DEFS@ -I$(libsrcdir)
25 $(CC) $(CFLAGS) $(CPPFLAGS) -S $<
27 -libkeeper = ../src/libkeeper.a
28 +libkeeper = ../src/libkeeper.la
30 example_objs = example.o $(libkeeper)
31 example: $(example_objs)
32 - $(CC) $(CFLAGS) $(LDFLAGS) -o example $(example_objs)
33 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o example $(example_objs)
35 kptest_objs = kptest.o $(libkeeper)
36 kptest: $(kptest_objs)
37 - $(CC) $(CFLAGS) $(LDFLAGS) -o kptest $(kptest_objs) -lpthread
38 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o kptest $(kptest_objs) -lpthread
40 test_reload_objs = test_reload.o $(libkeeper)
41 test_reload: $(test_reload_objs)
42 - $(CC) $(CFLAGS) $(LDFLAGS) -o test_reload $(test_reload_objs)
43 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o test_reload $(test_reload_objs)
46 cp -f Makefile Makefile.old
47 --- keeper-1.0/gkeeper/Makefile.in.orig Tue Feb 22 22:22:22 2000
48 +++ keeper-1.0/gkeeper/Makefile.in Wed May 7 15:48:58 2003
52 CPPFLAGS = @CPPFLAGS@ @DEFS@ -I$(libsrcdir) -I$(pixmapdir) -I.. `gtk-config --cflags`
53 -LDFLAGS = @LDFLAGS@ -L$(libsrcdir)
56 INSTALL_PROGRAM = @INSTALL_PROGRAM@
60 gtklibs = `gtk-config --libs`
65 gkeeper_objs = gkeeper.o tree.o edit.o menu.o dialog.o
66 -gkeeper_libs = $(gtklibs) -lkeeper
67 +gkeeper_libs = $(gtklibs) $(libsrcdir)/libkeeper.la
68 gkeeper: $(gkeeper_objs)
69 - $(CC) $(CFLAGS) $(LDFLAGS) -o gkeeper $(gkeeper_objs) $(gkeeper_libs)
70 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o gkeeper $(gkeeper_objs) $(gkeeper_libs)
73 - @if test -f gkeeper; then \
74 - $(INSTALL_PROGRAM) -m 755 gkeeper $(i_bindir); fi
75 + @if test -f gkeeper -o -f .libs/gkeeper ; then \
76 + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -m 755 gkeeper $(i_bindir); fi
79 cp -f Makefile Makefile.old
80 --- keeper-1.0/kptool/Makefile.in.orig Tue Feb 22 22:22:22 2000
81 +++ keeper-1.0/kptool/Makefile.in Wed May 7 15:48:31 2003
85 INSTALL_PROGRAM = @INSTALL_PROGRAM@
95 -kptool_objs = kptool.o kp_imp.o kp_exp.o $(libsrcdir)/libkeeper.a
96 +kptool_objs = kptool.o kp_imp.o kp_exp.o $(libsrcdir)/libkeeper.la
97 kptool: $(kptool_objs)
98 - $(CC) $(CFLAGS) $(LDFLAGS) -o kptool $(kptool_objs)
99 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o kptool $(kptool_objs)
102 @../mkinstalldirs $(i_bindir)
103 - $(INSTALL_PROGRAM) -m 755 kptool $(i_bindir)
104 + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -m 755 kptool $(i_bindir)
107 cp -f Makefile Makefile.old
108 --- keeper-1.0/src/Makefile.in.orig Tue Feb 22 22:22:22 2000
109 +++ keeper-1.0/src/Makefile.in Wed May 7 15:45:25 2003
113 INSTALL_DATA = @INSTALL_DATA@
120 +.SUFFIXES: .c .lo .s
123 - $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
125 + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
128 $(CC) $(CFLAGS) $(CPPFLAGS) -S $<
134 -install: libkeeper.a
135 +install: libkeeper.la
136 @../mkinstalldirs $(i_libdir)
137 @../mkinstalldirs $(i_incdir)
138 - $(INSTALL_DATA) libkeeper.a $(i_libdir)
139 + $(LIBTOOL) --mode=install $(INSTALL) libkeeper.la $(i_libdir)
140 $(INSTALL_DATA) keeper.h $(i_incdir)
143 -libkeeper_objs = kp_iface.o kp_cache.o kp_get.o kp_set.o kp_util.o \
144 - kp_dir.o kp_enum.o kp_sort.o kp_recur.o
145 +libkeeper_objs = kp_iface.lo kp_cache.lo kp_get.lo kp_set.lo kp_util.lo \
146 + kp_dir.lo kp_enum.lo kp_sort.lo kp_recur.lo
148 -libkeeper.a: $(libkeeper_objs)
149 - $(AR) cr libkeeper.a $(libkeeper_objs)
150 - $(RANLIB) libkeeper.a
151 +libkeeper.la: $(libkeeper_objs)
152 + $(LIBTOOL) --mode=link $(CC) -o libkeeper.la $(libkeeper_objs) -rpath $(i_libdir)