RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Aug-2008 22:53:32
Branch: rpm-5_1 Handle: 20080819205145107
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/python Makefile.am
Removed files: (Branch: rpm-5_1)
rpm/python/rpm .cvsignore Makefile.am
Log:
- jbj: python: simplify Makefile.am
Summary:
Revision Changes Path
1.2288.2.94 +1 -0 rpm/CHANGES
1.78.2.1 +18 -24 rpm/python/Makefile.am
1.2 +0 -8 rpm/python/rpm/.cvsignore
1.5 +0 -15 rpm/python/rpm/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.93 -r1.2288.2.94 CHANGES
--- rpm/CHANGES 19 Aug 2008 15:39:07 -0000 1.2288.2.93
+++ rpm/CHANGES 19 Aug 2008 20:53:31 -0000 1.2288.2.94
@@ -1,4 +1,5 @@
5.1.4 -> 5.1.5:
+ - jbj: python: simplify Makefile.am
- afb: check that crc32_combine/adler32_combine really exist, for murky
old
zlib.
- afb: remove undefined references too
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/Makefile.am
============================================================================
$ cvs diff -u -r1.78 -r1.78.2.1 Makefile.am
--- rpm/python/Makefile.am 15 Jan 2008 19:53:58 -0000 1.78
+++ rpm/python/Makefile.am 19 Aug 2008 20:53:32 -0000 1.78.2.1
@@ -4,17 +4,13 @@
LINT = splint
-pylibdir = @WITH_PYTHON_LIBDIR@
-pyincdir = @WITH_PYTHON_INCDIR@
-
-SUBDIRS = rpm
-
-EXTRA_DIST = system.h rpmdebug-py.c
+EXTRA_DIST = system.h rpmdebug-py.c rpm/__init__.py
AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
@@ -23,14 +19,20 @@
@WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@ \
- -I$(pyincdir)
+ [EMAIL PROTECTED]@
noinst_HEADERS = header-py.h \
rpmal-py.h rpmds-py.h rpmdb-py.h rpmfd-py.h rpmfts-py.h \
- rpmfi-py.h rpmmacro-py.h rpmmi-py.h rpmps-py.h rpmte-py.h rpmts-py.h \
+ rpmfi-py.h rpmkeyring-py.h rpmmacro-py.h rpmmi-py.h \
+ rpmps-py.h rpmte-py.h rpmts-py.h \
spec-py.h
-mylibs = \
+pkgpyexecdir = @WITH_PYTHON_LIBDIR@/rpm
+pkgpyexec_LTLIBRARIES = _rpmmodule.la
+pkgpyexec_SCRIPTS = rpm/__init__.py
+
+_rpmmodule_la_LDFLAGS = -module -avoid-version
+_rpmmodule_la_LIBADD = \
$(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
@@ -38,19 +40,11 @@
$(top_builddir)/misc/librpmmisc.la \
@LTLIBINTL@
-#LDADD =
-#LIBS =
-
-rpmdir = $(pylibdir)/rpm
-rpm_LTLIBRARIES = _rpmmodule.la
-
-_rpmmodule_la_LDFLAGS = $(mylibs) -module -avoid-version
-_rpmmodule_la_LIBADD =
-
-_rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
- rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c\
- rpmfi-py.c rpmmacro-py.c rpmmi-py.c rpmps-py.c \
- rpmte-py.c rpmts-py.c spec-py.c
+_rpmmodule_la_SOURCES = \
+ rpmmodule.c header-py.c \
+ rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c\
+ rpmfi-py.c rpmkeyring-py.c rpmmacro-py.c rpmmi-py.c rpmps-py.c \
+ rpmtd-py.c rpmte-py.c rpmts-py.c spec-py.c
# rpmmodule.c header-py.c \
# rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
@@ -58,8 +52,8 @@
# rpmmodule.c header-py.c
splint_srcs = \
rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
- rpmfi-py.c rpmmacro-py.c rpmmi-py.c rpmps-py.c rpmte-py.c rpmts-py.c \
- spec-py.c
+ rpmfi-py.c rpmkeyring-py.c rpmmacro-py.c rpmmi-py.c rpmps-py.c \
+ rpmtd-py.c rpmte-py.c rpmts-py.c spec-py.c
.PHONY: lint
lint:
@@ .
rm -f rpm/python/rpm/.cvsignore <<'@@ .'
Index: rpm/python/rpm/.cvsignore
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f rpm/python/rpm/Makefile.am <<'@@ .'
Index: rpm/python/rpm/Makefile.am
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
