diff options
Diffstat (limited to 'archivers/rpm4/files/patch-rpmio::Makefile.in')
| -rw-r--r-- | archivers/rpm4/files/patch-rpmio::Makefile.in | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/archivers/rpm4/files/patch-rpmio::Makefile.in b/archivers/rpm4/files/patch-rpmio::Makefile.in index 87671759506e..54ce4ee11346 100644 --- a/archivers/rpm4/files/patch-rpmio::Makefile.in +++ b/archivers/rpm4/files/patch-rpmio::Makefile.in @@ -1,26 +1,19 @@ ---- rpmio/Makefile.in.orig Thu Feb 14 16:58:37 2002 -+++ rpmio/Makefile.in Thu Mar 4 00:55:37 2004 -@@ -197,7 +197,7 @@ - -I$(top_srcdir)/build \ - -I$(top_srcdir)/lib \ +--- rpmio/Makefile.in.orig Thu Feb 14 23:58:37 2002 ++++ rpmio/Makefile.in Wed Jan 25 01:44:09 2006 +@@ -199,3 +199,3 @@ -I$(top_srcdir)/beecrypt \ - -I$(top_srcdir)/popt \ + @WITH_POPT_INCLUDE@ \ @WITH_ZLIB_INCLUDE@ \ - @INCPATH@ - -@@ -209,7 +209,7 @@ - - noinst_HEADERS = rpmio_internal.h rpmpgp.h +@@ -211,5 +211,6 @@ -LIBS = @LIBS@ @WITH_ZLIB_LIB@ -lrt -lpthread +LIBS = @LIBS@ @WITH_ZLIB_LIB@ BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs) ++BEECRYPTOBJS = $(BEECRYPTLOBJS:.lo=.o) -@@ -222,18 +222,18 @@ - librpmio_la_DEPENDENCIES = .created - +@@ -224,6 +225,6 @@ tdigest_SOURCES = tdigest.c -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tdigest_LDADD = librpmio.la @WITH_POPT_LIB@ @@ -29,21 +22,17 @@ -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +trpmio_LDADD = librpmio.la @WITH_POPT_LIB@ - tkey_SOURCES = tkey.c +@@ -231,3 +232,3 @@ tkey_LDFLAGS = -all-static -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tkey_LDADD = librpmio.la @WITH_POPT_LIB@ - tring_SOURCES = tring.c +@@ -235,3 +236,3 @@ tring_LDFLAGS = -all-static -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tring_LDADD = librpmio.la @WITH_POPT_LIB@ - dumpasn1_SOURCES = dumpasn1.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -248,15 +248,17 @@ - librpmio_la_OBJECTS = digest.lo macro.lo rpmio.lo rpmlog.lo \ - rpmmalloc.lo rpmpgp.lo rpmrpc.lo strcasecmp.lo stubs.lo url.lo ugid.lo +@@ -250,11 +251,13 @@ tdigest_OBJECTS = tdigest.$(OBJEXT) -tdigest_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la -tdigest_LDFLAGS = @@ -63,23 +52,20 @@ +trpmio_DEPENDENCIES = librpmio.la +trpmio_LDFLAGS = @WITH_POPT_LIB@ dumpasn1_OBJECTS = dumpasn1.$(OBJEXT) - dumpasn1_LDADD = $(LDADD) - dumpasn1_DEPENDENCIES = -@@ -461,7 +463,7 @@ - install-exec-am: install-libLTLIBRARIES - install-exec: install-exec-am +@@ -463,3 +466,3 @@ -install-data-am: install-pkgincHEADERS install-data-local +install-data-am: install-pkgincHEADERS install-data: install-data-am - - install-am: all-am -@@ -535,7 +537,7 @@ - mv .librpmio.la librpmio.la - +@@ -537,3 +540,3 @@ $(top_builddir)/beecrypt/listobjs: - make -C $(top_builddir)/beecrypt listobjs + $(MAKE) -C $(top_builddir)/beecrypt listobjs - .created: $(top_builddir)/beecrypt/listobjs - for lo in $(BEECRYPTLOBJS); do \ +@@ -542,2 +545,6 @@ + [ -f $$lo ] || $(LN_S) $(top_builddir)/beecrypt/$$lo $$lo ; \ ++ done ++ for o in $(BEECRYPTOBJS); do \ ++ $(LN_S) ../../beecrypt/.libs/$$o .libs/$$o ; \ ++ $(LN_S) ../beecrypt/$$o $$o ; \ + done |