RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jun-2007 22:39:09
Branch: HEAD Handle: 2007062421390800
Modified files:
rpm Makefile.am
Log:
cleanup some parts of this Automake template
Summary:
Revision Changes Path
2.174 +5 -3 rpm/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.173 -r2.174 Makefile.am
--- rpm/Makefile.am 24 Jun 2007 18:12:30 -0000 2.173
+++ rpm/Makefile.am 24 Jun 2007 20:39:08 -0000 2.174
@@ -32,7 +32,8 @@
rpmdb \
lib \
build \
- @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ \
+ @WITH_PYTHON_SUBDIR@ \
+ @WITH_PERL_SUBDIR@ \
tools \
scripts \
doc \
@@ -51,6 +52,7 @@
myLDFLAGS = @WITH_LIBELF_LIB@
myLDADD = \
+ $(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la
@@ -65,13 +67,13 @@
rpm_SOURCES = $(top_srcdir)/build.c
rpm_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
-rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a
$(myLDADD)
+rpm_LDADD = rpm.o $(myLDADD)
rpm.o: $(top_srcdir)/rpmqv.c
$(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV
-o $@ -c $<
rpmbuild_SOURCES = $(top_srcdir)/build.c
rpmbuild_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
-rpmbuild_LDADD = rpmbuild.o $(top_builddir)/build/librpmbuild.la
$(myLDADD)
+rpmbuild_LDADD = rpmbuild.o $(myLDADD)
rpmbuild.o: $(top_srcdir)/rpmqv.c
$(COMPILE) -DIAM_RPMBT -o $@ -c $<
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
