1 --- rpm-4.2/rpmio/Makefile.am.wiget Wed Mar 12 15:10:27 2003
2 +++ rpm-4.2/rpmio/Makefile.am Wed Mar 12 15:10:27 2003
4 lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
6 tdigest_SOURCES = tdigest.c
7 -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
8 +tdigest_LDADD = librpmio.la -lpopt
11 tdir_LDFLAGS = -all-static
12 -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
13 +tdir_LDADD = librpmio.la -lpopt
16 tfts_LDFLAGS = -all-static
17 -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
18 +tfts_LDADD = librpmio.la -lpopt
20 tglob_SOURCES = tglob.c
21 tglob_LDFLAGS = -all-static
22 -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
23 +tglob_LDADD = librpmio.la -lpopt
26 tinv_LDFLAGS = -all-static
27 -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
28 +tinv_LDADD = librpmio.la -lpopt
31 tkey_LDFLAGS = -all-static
32 -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
33 +tkey_LDADD = librpmio.la -lpopt
35 tring_SOURCES = tring.c
36 tring_LDFLAGS = -all-static
37 -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
38 +tring_LDADD = librpmio.la -lpopt
40 trpmio_SOURCES = trpmio.c
41 -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
42 +trpmio_LDADD = librpmio.la -lpopt
44 dumpasn1_SOURCES = dumpasn1.c
46 --- rpm-4.2/python/Makefile.am.wiget Wed Oct 9 21:09:43 2002
47 +++ rpm-4.2/python/Makefile.am Wed Mar 12 15:10:27 2003
49 $(top_builddir)/lib/.libs/librpm.so \
50 $(top_builddir)/rpmdb/.libs/librpmdb.so \
51 $(top_builddir)/rpmio/.libs/librpmio.so \
52 - $(top_builddir)/popt/.libs/libpopt.so
57 --- rpm-4.2/tools/Makefile.am.wiget Thu Oct 24 21:23:46 2002
58 +++ rpm-4.2/tools/Makefile.am Wed Mar 12 15:10:27 2003
60 $(top_builddir)/lib/librpm.la \
61 $(top_builddir)/rpmdb/librpmdb.la \
62 $(top_builddir)/rpmio/librpmio.la \
63 - $(top_builddir)/popt/libpopt.la \
68 --- rpm-4.2/configure.ac.wiget Wed Mar 12 15:10:26 2003
69 +++ rpm-4.2/configure.ac Wed Mar 12 15:10:27 2003
71 dnl # XXX Propagate -lucb to popt ...
72 dnl export LIBS INCPATH CONFIG_SITE
74 -AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
75 +AC_CONFIG_SUBDIRS(beecrypt)
77 AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
78 macros.perl scripts/perl.req scripts/perl.prov
79 --- rpm-4.2/Makefile.am.wiget Thu Oct 24 22:11:18 2002
80 +++ rpm-4.2/Makefile.am Wed Mar 12 15:10:27 2003
82 po/*.in po/*.po po/rpm.pot \
83 rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
85 -SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ elfutils file @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
86 +SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
89 -I$(top_srcdir)/build \
91 $(top_builddir)/lib/librpm.la \
92 $(top_builddir)/rpmdb/librpmdb.la \
93 $(top_builddir)/rpmio/librpmio.la \
94 - $(top_builddir)/popt/libpopt.la \
100 -load lib/rpmlib.lcd \
101 -load rpmdb/rpmdb.lcd \
102 -load rpmio/rpmio.lcd \
103 - -load popt/popt.lcd \
104 $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
108 `make -s sources -C lib` \
109 `make -s sources -C rpmdb` \
110 `make -s sources -C rpmio` \
111 - `make -s sources -C beecrypt` \
112 - `make -s sources -C popt`
113 + `make -s sources -C beecrypt`
115 CVSTAG = r$(subst .,-,$(VERSION))