projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 4cd84746 JB |
1 | --- rpm-4.1/build/Makefile.am.orig Mon Jul 22 00:06:19 2002 |
| 2 | +++ rpm-4.1/build/Makefile.am Sun Nov 24 19:25:53 2002 | |
| 3 | @@ -23,12 +23,7 @@ | |
| 4 | parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \ | |
| 5 | parseSpec.c poptBT.c reqprov.c spec.c | |
| 6 | librpmbuild_la_LDFLAGS = -release @VERSION@ | |
| 7 | - | |
| 8 | -# XXX Add internal libtool dependence | |
| 9 | -install-data-local: | |
| 10 | - @cd $(DESTDIR)/$(libdir) && \ | |
| 11 | - sed -e "s|^dependency_libs='|& -lrpm-@VERSION@|" < librpmbuild.la > .librpmbuild.la && \ | |
| 12 | - mv .librpmbuild.la librpmbuild.la | |
| 13 | +librpmbuild_la_LIBADD = ../lib/librpm.la | |
| 14 | ||
| 15 | #BUILT_SOURCES = rpmbuild.lcd | |
| 16 | ||
| 17 | --- rpm-4.1/lib/Makefile.am.orig Fri Aug 30 13:41:54 2002 | |
| 18 | +++ rpm-4.1/lib/Makefile.am Sun Nov 24 19:29:23 2002 | |
| 19 | @@ -38,12 +38,7 @@ | |
| 20 | signature.c stringbuf.c transaction.c \ | |
| 21 | verify.c | |
| 22 | librpm_la_LDFLAGS = -release @VERSION@ | |
| 23 | - | |
| 24 | -# XXX Add internal libtool dependence | |
| 25 | -install-data-local: | |
| 26 | - @cd $(DESTDIR)/$(libdir) && \ | |
| 27 | - sed -e "s|^dependency_libs='|& -lrpmdb-@VERSION@ -lrpmio-@VERSION@ -lpopt|" < librpm.la > .librpm.la && \ | |
| 28 | - mv .librpm.la librpm.la | |
| 29 | +librpm_la_LIBADD = ../rpmdb/librpmdb.la ../rpmio/librpmio.la -lpopt | |
| 30 | ||
| 31 | getdate.c: getdate.y | |
| 32 | @echo expect 10 shift/reduce conflicts | |
| 33 | --- rpm-4.1/rpmdb/Makefile.am.orig Fri Aug 30 15:12:01 2002 | |
| 34 | +++ rpm-4.1/rpmdb/Makefile.am Sun Nov 24 19:30:41 2002 | |
| 35 | @@ -40,18 +40,12 @@ | |
| 36 | poptDB.c rpmhash.c rpmdb.c \ | |
| 37 | tagname.c tagtbl.c | |
| 38 | librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@ | |
| 39 | -librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) @WITH_LIBELF_LIB@ | |
| 40 | +librpmdb_la_LIBADD = ../rpmio/librpmio.la $(DBLIBOBJS) $(DB3LOBJS) @WITH_LIBELF_LIB@ | |
| 41 | librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created | |
| 42 | ||
| 43 | # XXX make sure that db.h symlink is generated | |
| 44 | dbconfig.c: db.h | |
| 45 | ||
| 46 | -# XXX Add internal libtool dependence | |
| 47 | -install-data-local: | |
| 48 | - @cd $(DESTDIR)/$(libdir) && \ | |
| 49 | - sed -e "s|^dependency_libs='|& -lrpmio-@VERSION@|" < librpmdb.la > .librpmdb.la && \ | |
| 50 | - mv .librpmdb.la librpmdb.la | |
| 51 | - | |
| 52 | tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmlib.h | |
| 53 | @echo '/*@-bounds@*/' > $@ | |
| 54 | @echo '#include "system.h"' >> $@ | |
| 55 | --- rpm-4.1/rpmio/Makefile.am.orig Sun Nov 24 19:22:06 2002 | |
| 56 | +++ rpm-4.1/rpmio/Makefile.am Sun Nov 24 19:31:18 2002 | |
| 57 | @@ -26,15 +26,9 @@ | |
| 58 | rpmio.c rpmlog.c rpmmalloc.c \ | |
| 59 | rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c | |
| 60 | librpmio_la_LDFLAGS = -release @VERSION@ @WITH_ZLIB_LIB@ -lrt -lpthread | |
| 61 | -librpmio_la_LIBADD = $(BEECRYPTLOBJS) | |
| 62 | +librpmio_la_LIBADD = -lpopt $(BEECRYPTLOBJS) | |
| 63 | librpmio_la_DEPENDENCIES = .created | |
| 64 | ||
| 65 | -# XXX Add internal libtool dependence | |
| 66 | -install-data-local: | |
| 67 | - @cd $(DESTDIR)/$(libdir) && \ | |
| 68 | - sed -e "s|^dependency_libs='|& -lpopt|" < librpmio.la > .librpmio.la && \ | |
| 69 | - mv .librpmio.la librpmio.la | |
| 70 | - | |
| 71 | $(top_builddir)/beecrypt/listobjs: | |
| 72 | ${MAKE} -C $(top_builddir)/beecrypt listobjs | |
| 73 |