makefiles cleanup1

2003-11-24 20:44:29 +00:00 · 2003-11-24 20:44:29 +00:00 · 1cff6d97bc
commit 1cff6d97bc
parent 298ea42153
8 changed files with 40 additions and 60 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -28,7 +28,7 @@ myLDADD = \
 	$(top_builddir)/lib/librpm.la \
 	$(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	@LIBBEECRYPT@ @LIBINTL@ @LIBMISC@
+	@LIBINTL@

 rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
 rpmbin_PROGRAMS = rpm
@ -89,7 +89,7 @@ rpmq.o:	rpmqv.c

 rpm2cpio_SOURCES =	rpm2cpio.c
 rpm2cpio_LDFLAGS =	$(myLDFLAGS)
-rpm2cpio_LDADD =	$(myLDADD) @LIBMISC@
+rpm2cpio_LDADD =	$(myLDADD)

 $(PROGRAMS): 		$(myLDADD) @WITH_APIDOCS_TARGET@

--- a/build/Makefile.am
+++ b/build/Makefile.am
@ -21,12 +21,8 @@ librpmbuild_la_SOURCES = \
 	parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
 	parseSpec.c poptBT.c reqprov.c spec.c
 librpmbuild_la_LDFLAGS = -release @VERSION@
-
-# XXX Add internal libtool dependence
-install-data-local:
-	@cd $(DESTDIR)/$(libdir) && \
-	sed -e "s|^dependency_libs='|& -lrpm|" < librpmbuild.la > .librpmbuild.la && \
-	mv .librpmbuild.la librpmbuild.la
+librpmbuild_la_LIBADD = $(top_builddir)/lib/librpm.la
+librpmbuild_la_DEPENDENCIES = $(top_builddir)/lib/librpm.la

 .PHONY:	sources
 sources:
--- a/configure.in
+++ b/configure.in
@ -386,31 +386,37 @@ dnl AmigaOS and IXEmul have a fork() dummy
 	;;
  esac

+LIBZ=
 if test -z "${WITH_ZLIB_LIB}" ; then
 for zlib in z gz ; do
   AC_CHECK_LIB(${zlib}, gzread, 
-	[LIBS="$LIBS -l${zlib}"; break], 
+	[LIBZ="-l$zlib"; break], 
 	[if test ${zlib} = gz; then 
 	    AC_MSG_ERROR([sorry rpm requires libz.a or libgz.a (from the zlib package)]) 
 	 fi]
 	       )
 done
+AC_SUBST(LIBZ)

 dnl zlib-1.0.4 has not gzseek
 AC_CHECK_LIB(${zlib}, gzseek, [AC_DEFINE(HAVE_GZSEEK, 1, [Define as 1 if your zlib has gzseek()])])
 fi

+BZLIB=
 AC_CHECK_LIB(bz2, BZ2_bzread, [
 	WITH_BZIP2=1
-	LIBS="$LIBS -lbz2"
+	LIBBZ2="-lbz2"
 	AC_DEFINE(HAVE_BZ2_1_0, 1, [Define as 1 if you bzip2 1.0]) ], 
 	AC_CHECK_LIB(bz2, bzread, [
 		WITH_BZIP2=1
-		LIBS="$LIBS -lbz2" ], 
+		LIBBZ2="-lbz2" ], 
 		WITH_BZIP2=0))
 AC_SUBST(WITH_BZIP2)
+AC_SUBST(LIBBZ2)

-AC_CHECK_LIB(popt, poptGetContext)
+LIBPOPT=
+AC_CHECK_LIB(popt, poptGetContext, [LIBPOPT="-lpopt"])
+AC_SUBST(LIBPOPT)

 AC_CHECK_LIB(beecrypt, hashFunctionContextInit, [LIBBEECRYPT="-lbeecrypt"])
 AC_SUBST(LIBBEECRYPT)
@ -978,7 +984,6 @@ dnl AC_DEFINE_UNQUOTED(testdir, "$testdir")
 AC_SUBST(testdir)

 AC_SUBST(INCPATH)
-AC_SUBST(LIBMISC)

 AC_SUBST(RPM)

--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -24,7 +24,7 @@ mylibpaths = \
 	-L$(top_builddir)/rpmdb/.libs \
 	-L$(top_builddir)/rpmio/.libs

-mylibs = -lrpm -lrpmdb -lrpmio @LIBS@ @LIBINTL@ @LIBMISC@
+mylibs = -lrpm -lrpmdb -lrpmio @LIBS@ @LIBINTL@
 LIBS =

 lib_LTLIBRARIES = librpm.la
@ -37,12 +37,8 @@ librpm_la_SOURCES = \
 	signature.c stringbuf.c tagName.c tagtable.c transaction.c \
 	verify.c
 librpm_la_LDFLAGS = -release @VERSION@
-
-# XXX Add internal libtool dependence
-install-data-local:
-	@cd $(DESTDIR)/$(libdir) && \
-	sed -e "s|^dependency_libs='|& -lrpmdb -lrpmio|" < librpm.la > .librpm.la && \
-	mv .librpm.la librpm.la
+librpm_la_LIBADD = $(top_builddir)/rpmdb/librpmdb.la $(top_builddir)/rpmio/librpmio.la @LIBPOPT@
+librpm_la_DEPENDENCIES = $(top_builddir)/rpmdb/librpmdb.la $(top_builddir)/rpmio/librpmio.la

 tagtable.c: rpmlib.h 
 	@echo '#include "system.h"' > tagtable.c
--- a/python/Makefile.am
+++ b/python/Makefile.am
@ -14,9 +14,7 @@ INCLUDES = -I. \
 noinst_HEADERS = db-py.h hash.h header-py.c header-py.h upgrade.h

 mylibs= \
-	$(top_builddir)/lib/librpm.la \
-	$(top_builddir)/rpmdb/librpmdb.la \
-	$(top_builddir)/rpmio/librpmio.la
+	$(top_builddir)/lib/librpm.la

 LDADD =

--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@ -8,7 +8,9 @@ INCLUDES = -I. \
 	-I$(top_srcdir)/rpmio \
 	@INCPATH@

-EXTRA_DIST = db3.c db1.c falloc.c
+DBLIBSRCS = db3.c db1.c falloc.c
+
+LIBDB = @libdb3@

 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = rpmdb.h
@ -18,21 +20,15 @@ mylibpaths = \
 	-L$(top_builddir)/lib/.libs \
 	-L$(top_builddir)/rpmio/.libs

-mylibs = -lrpm -lrpmio @LIBS@ @LIBINTL@ @LIBMISC@
+mylibs = -lrpm -lrpmio @LIBS@ @LIBINTL@
 LIBS =

 lib_LTLIBRARIES = librpmdb.la
 librpmdb_la_SOURCES = $(DBLIBSRCS) \
 	dbconfig.c fprint.c merge.c poptDB.c rpmhash.c rpmdb.c
 librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@
-librpmdb_la_LIBADD = $(DBLIBOBJS)
-librpmdb_la_DEPENDENCIES = $(DBLIBOBJS)
-
-# XXX Add internal libtool dependence
-install-data-local:
-	@cd $(DESTDIR)/$(libdir) && \
-	sed -e "s|^dependency_libs='|& -lrpmio|" < librpmdb.la > .librpmdb.la && \
-	mv .librpmdb.la librpmdb.la
+librpmdb_la_LIBADD = $(DBLIBOBJS) $(LIBDB) $(top_builddir)/rpmio/librpmio.la
+librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(top_builddir)/rpmio/librpmio.la

 falloc.lo: falloc.c $(top_srcdir)/system.h $(top_srcdir)/rpmio/rpmio.h falloc.h
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@ -6,8 +6,7 @@ EXTRA_DIST = tdigest.c tficl.c tkey.c trpmio.c

 EXTRA_PROGRAMS = tdigest tkey tring trpmio dumpasn1

-INCLUDES = -I. \
-	@INCPATH@
+INCLUDES = -I. @INCPATH@

 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = \
@ -19,30 +18,24 @@ lib_LTLIBRARIES = librpmio.la
 librpmio_la_SOURCES = digest.c macro.c rpmio.c rpmlog.c rpmmalloc.c \
 	rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c
 librpmio_la_LDFLAGS = -release @VERSION@
-librpmio_la_LIBADD = @LIBBEECRYPT@
-
-# XXX Add internal libtool dependence
-install-data-local:
-	@cd $(DESTDIR)/$(libdir) && \
-	sed -e 's,^\(dependency_libs=.*\) -lrt,\1,g;s,^\(dependency_libs=.*\) -lpthread,\1,g' < librpmio.la > .librpmio.la && \
-	mv .librpmio.la librpmio.la
+librpmio_la_LIBADD = @LIBBEECRYPT@ @LIBBZ2@ @LIBZ@

 clean-local:
 	rm -f *.o

 tdigest_SOURCES = tdigest.c
-tdigest_LDADD = librpmio.la -lpopt
+tdigest_LDADD = librpmio.la @LIBPOPT@

 trpmio_SOURCES = trpmio.c
-trpmio_LDADD = librpmio.la -lpopt
+trpmio_LDADD = librpmio.la @LIBPOPT@

 tkey_SOURCES = tkey.c
 tkey_LDFLAGS = -all-static
-tkey_LDADD = librpmio.la -lpopt
+tkey_LDADD = librpmio.la @LIBPOPT@

 tring_SOURCES = tring.c
 tring_LDFLAGS = -all-static
-tring_LDADD = librpmio.la -lpopt
+tring_LDADD = librpmio.la @LIBPOPT@

 dumpasn1_SOURCES = dumpasn1.c

--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@ -17,7 +17,7 @@ EXTRA_PROGRAMS = rpminject rpmsort
 #myLDFLAGS= -L$(top_builddir)/build -L$(top_builddir)/lib \
 #	-L$(top_builddir)/rpmio

-LDADD = \
+myLDADD = \
 	$(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la \
 	$(top_builddir)/rpmdb/librpmdb.la \
@ -30,22 +30,18 @@ noinst_PROGRAMS = \
 pkgbindir = @RPMCONFIGDIR@
 pkgbin_PROGRAMS = javadeps filesize relative pdeath_execute

-rpmsort_SOURCES =	rpmsort.c
-rpmsort_LDFLAGS =	@LDFLAGS_STATIC@
+rpmsort_SOURCES = rpmsort.c
+rpmsort_LDFLAGS = @LDFLAGS_STATIC@
+rpmsort_LDADD =	$(myLDADD)

-javadeps_SOURCES =	javadeps.c
+javadeps_SOURCES = javadeps.c
+javadeps_LDADD = $(myLDADD)

-filesize_SOURCES =	filesize.c
-filesize_LDADD =
-filesize_DEPENDENCIES =
+filesize_SOURCES = filesize.c

-relative_SOURCES =	relative.c
-relative_LDADD =
-relative_DEPENDENCIES =
+relative_SOURCES = relative.c

-pdeath_execute_SOURCES =	pdeath_execute.c
-pdeath_execute_LDADD =
-pdeath_execute_DEPENDENCIES =
+pdeath_execute_SOURCES = pdeath_execute.c

 $(PROGRAMS): $(LDADD)

@ -53,5 +49,5 @@ gnash.o: gnash.c
 	$(COMPILE) -o $@ -c gnash.c

 gnash: gnash.o
-	$(LINK) -all-static -o $@ gnash.o $(LDADD)
+	$(LINK) -all-static -o $@ gnash.o $(myLDADD)