RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   27-Jun-2007 12:13:28
  Branch: HEAD                             Handle: 2007062711132701

  Modified files:
    rpm                     CHANGES
    rpm/build               Makefile.am
    rpm/lib                 Makefile.am
    rpm/rpmdb               Makefile.am
    rpm/rpmio               Makefile.am

  Log:
    Consistently move libraries from Automake _LDFLAGS to _LIBADD variables
    as this is the canonical and intended place for libraries in Automake.

  Summary:
    Revision    Changes     Path
    1.1404      +1  -0      rpm/CHANGES
    2.62        +2  -1      rpm/build/Makefile.am
    2.156       +2  -1      rpm/lib/Makefile.am
    1.63        +3  -2      rpm/rpmdb/Makefile.am
    1.89        +2  -1      rpm/rpmio/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1403 -r1.1404 CHANGES
  --- rpm/CHANGES	27 Jun 2007 09:45:14 -0000	1.1403
  +++ rpm/CHANGES	27 Jun 2007 10:13:27 -0000	1.1404
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rse: consistently move libraries from Automake _LDFLAGS to _LIBADD variables
       - rse: move misc/*.c from rpmio/stubs.c into misc/librpmmisc.c and build regular librpmmisc.la
       - rse: support building without ZLib via --without-zlib
       - rse: in rpmio for LZMA use %{__lzma} macro instead of hard-coded /usr/bin/lzma when possible
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.61 -r2.62 Makefile.am
  --- rpm/build/Makefile.am	27 Jun 2007 09:45:14 -0000	2.61
  +++ rpm/build/Makefile.am	27 Jun 2007 10:13:27 -0000	2.62
  @@ -26,7 +26,8 @@
   	parseBuildInstallClean.c parseChangelog.c parseDescription.c \
   	parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
   	parseSpec.c poptBT.c reqprov.c spec.c
  -librpmbuild_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
  +librpmbuild_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS)
  +librpmbuild_la_LIBADD = \
   	$(top_builddir)/lib/librpm.la \
   	$(top_builddir)/rpmdb/librpmdb.la \
   	$(top_builddir)/rpmio/librpmio.la \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.155 -r2.156 Makefile.am
  --- rpm/lib/Makefile.am	27 Jun 2007 09:45:15 -0000	2.155
  +++ rpm/lib/Makefile.am	27 Jun 2007 10:13:28 -0000	2.156
  @@ -37,7 +37,8 @@
   	rpmlead.c rpmlock.c rpmns.c rpmps.c rpmrc.c rpmsx.c rpmte.c rpmts.c \
   	signature.c stringbuf.c transaction.c \
   	verify.c tar.c
  -librpm_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
  +librpm_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS)
  +librpm_la_LIBADD = \
   	$(top_builddir)/rpmdb/librpmdb.la \
   	$(top_builddir)/rpmio/librpmio.la \
   	$(top_builddir)/misc/librpmmisc.la \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.62 -r1.63 Makefile.am
  --- rpm/rpmdb/Makefile.am	27 Jun 2007 09:45:15 -0000	1.62
  +++ rpm/rpmdb/Makefile.am	27 Jun 2007 10:13:28 -0000	1.63
  @@ -47,10 +47,11 @@
   	hdrNVR.c header.c header_internal.c legacy.c merge.c \
   	poptDB.c rpmdb.c \
   	tagname.c tagtbl.c
  -librpmdb_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) \
  +librpmdb_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION)
  +librpmdb_la_LIBADD = \
  +	$(DBLIBOBJS) $(libdb_la) \
   	$(top_builddir)/rpmio/librpmio.la \
   	$(top_builddir)/misc/librpmmisc.la
  -librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
   librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
   
   if HAVE_LD_VERSION_SCRIPT
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.88 -r1.89 Makefile.am
  --- rpm/rpmio/Makefile.am	27 Jun 2007 09:45:16 -0000	1.88
  +++ rpm/rpmio/Makefile.am	27 Jun 2007 10:13:28 -0000	1.89
  @@ -32,7 +32,8 @@
   	rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c strtolocale.c \
   	url.c ugid.c \
   	LzmaDecode.c
  -librpmio_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
  +librpmio_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS)
  +librpmio_la_LIBADD = \
       $(top_builddir)/misc/librpmmisc.la \
   	@LTLIBINTL@
   
  @@ .