projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 29d9755a AF |
1 | --- rpm-4.1/configure.ac.nointernallib Thu Sep 19 04:02:42 2002 |
| 2 | +++ rpm-4.1/configure.ac Thu Sep 19 04:03:04 2002 | |
| 3 | @@ -1194,7 +1194,7 @@ | |
| 4 | dnl # XXX Propagate -lucb to popt ... | |
| 5 | dnl export LIBS INCPATH CONFIG_SITE | |
| 6 | ||
| 7 | -AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3) | |
| 1b8d261d | 8 | +AC_CONFIG_SUBDIRS(beecrypt) |
| 29d9755a AF |
9 | |
| 10 | AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec m4/Makefile | |
| 11 | macros.perl scripts/perl.req scripts/perl.prov | |
| 12 | --- rpm-4.1/Makefile.am.nointernallib Thu Sep 19 04:03:19 2002 | |
| 13 | +++ rpm-4.1/Makefile.am Thu Sep 19 04:04:00 2002 | |
| 14 | @@ -12,7 +12,7 @@ | |
| 15 | po/*.in po/*.po po/rpm.pot \ | |
| 16 | rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c | |
| 17 | ||
| 18 | -SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ libelf @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . | |
| 1b8d261d | 19 | +SUBDIRS = intl po beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . |
| 29d9755a AF |
20 | |
| 21 | INCLUDES = \ | |
| 22 | -I$(top_srcdir)/build \ | |
| 1b8d261d MM |
23 | @@ -35,7 +35,7 @@ |
| 24 | $(top_builddir)/lib/librpm.la \ | |
| 25 | $(top_builddir)/rpmdb/librpmdb.la \ | |
| 26 | $(top_builddir)/rpmio/librpmio.la \ | |
| 27 | - $(top_builddir)/popt/libpopt.la \ | |
| 28 | + -lpopt \ | |
| 29 | @WITH_LIBELF_LIB@ \ | |
| 30 | @WITH_ZLIB_LIB@ \ | |
| 31 | @INTLLIBS@ \ | |
| 32 | @@ -111,7 +111,6 @@ | |
| 33 | -load lib/rpmlib.lcd \ | |
| 34 | -load rpmdb/rpmdb.lcd \ | |
| 35 | -load rpmio/rpmio.lcd \ | |
| 36 | - -load popt/popt.lcd \ | |
| 37 | $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) | |
| 38 | ||
| 39 | .PHONY: lclint | |
| 40 | @@ -121,8 +120,7 @@ | |
| 41 | `make -s sources -C lib` \ | |
| 42 | `make -s sources -C rpmdb` \ | |
| 43 | `make -s sources -C rpmio` \ | |
| 44 | - `make -s sources -C beecrypt` \ | |
| 45 | - `make -s sources -C popt` | |
| 46 | + `make -s sources -C beecrypt` | |
| 47 | ||
| 48 | CVSTAG = r$(subst .,-,$(VERSION)) | |
| 49 | ||
| 50 | --- rpm-4.1/python/Makefile.am~ Fri Oct 18 08:38:02 2002 | |
| 51 | +++ rpm-4.1/python/Makefile.am Fri Oct 18 08:55:34 2002 | |
| 52 | @@ -25,7 +23,7 @@ | |
| 53 | $(top_builddir)/lib/.libs/librpm.so \ | |
| 54 | $(top_builddir)/rpmdb/.libs/librpmdb.so \ | |
| 55 | $(top_builddir)/rpmio/.libs/librpmio.so \ | |
| 56 | - $(top_builddir)/popt/.libs/libpopt.so | |
| 57 | + -lpopt | |
| 58 | ||
| 59 | LDADD = | |
| 60 | ||
| 61 | --- rpm-4.1/rpmio/Makefile.am~ Fri Oct 18 08:38:02 2002 | |
| 62 | +++ rpm-4.1/rpmio/Makefile.am Fri Oct 18 10:43:29 2002 | |
| 63 | @@ -67,34 +67,34 @@ | |
| 64 | lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) | |
| 65 | ||
| 66 | tdigest_SOURCES = tdigest.c | |
| 67 | -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
| 68 | +tdigest_LDADD = librpmio.la -lpopt | |
| 69 | ||
| 70 | tdir_SOURCES = tdir.c | |
| 71 | tdir_LDFLAGS = -all-static | |
| 72 | -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
| 73 | +tdir_LDADD = librpmio.la -lpopt | |
| 74 | ||
| 75 | tfts_SOURCES = tfts.c | |
| 76 | tfts_LDFLAGS = -all-static | |
| 77 | -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
| 78 | +tfts_LDADD = librpmio.la -lpopt | |
| 79 | ||
| 80 | tglob_SOURCES = tglob.c | |
| 81 | tglob_LDFLAGS = -all-static | |
| 82 | -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
| 83 | +tglob_LDADD = librpmio.la -lpopt | |
| 84 | ||
| 85 | tinv_SOURCES = tinv.c | |
| 86 | tinv_LDFLAGS = -all-static | |
| 87 | -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
| 88 | +tinv_LDADD = librpmio.la -lpopt | |
| 89 | ||
| 90 | tkey_SOURCES = tkey.c | |
| 91 | tkey_LDFLAGS = -all-static | |
| 92 | -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
| 93 | +tkey_LDADD = librpmio.la -lpopt | |
| 94 | ||
| 95 | tring_SOURCES = tring.c | |
| 96 | tring_LDFLAGS = -all-static | |
| 97 | -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
| 98 | +tring_LDADD = librpmio.la -lpopt | |
| 99 | ||
| 100 | trpmio_SOURCES = trpmio.c | |
| 101 | -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
| 102 | +trpmio_LDADD = librpmio.la -lpopt | |
| 103 | ||
| 104 | dumpasn1_SOURCES = dumpasn1.c | |
| 105 | ||
| 106 | --- rpm-4.1/tools/Makefile.am~ Thu Aug 22 19:42:37 2002 | |
| 107 | +++ rpm-4.1/tools/Makefile.am Fri Oct 18 11:12:37 2002 | |
| 108 | @@ -23,7 +23,7 @@ | |
| 109 | $(top_builddir)/lib/librpm.la \ | |
| 110 | $(top_builddir)/rpmdb/librpmdb.la \ | |
| 111 | $(top_builddir)/rpmio/librpmio.la \ | |
| 112 | - $(top_builddir)/popt/libpopt.la \ | |
| 113 | + -lpopt \ | |
| 114 | @WITH_LIBELF_LIB@ \ | |
| 115 | @INTLLIBS@ | |
| 116 |