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:51:45
Branch: HEAD Handle: 2008081920514401
Modified files:
rpm CHANGES
rpm/python Makefile.am
Removed files:
rpm/python/rpm .cvsignore Makefile.am
Log:
- jbj: python: simplify Makefile.am
Summary:
Revision Changes Path
1.2530 +1 -0 rpm/CHANGES
1.82 +8 -17 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.2529 -r1.2530 CHANGES
--- rpm/CHANGES 19 Aug 2008 14:46:27 -0000 1.2529
+++ rpm/CHANGES 19 Aug 2008 20:51:44 -0000 1.2530
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - jbj: python: simplify Makefile.am
- jbj: display sysinfo path with --showrc.
- jbj: remove internal zlib.
- jbj: WR: eliminate most compiler warnings.
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/Makefile.am
============================================================================
$ cvs diff -u -r1.81 -r1.82 Makefile.am
--- rpm/python/Makefile.am 30 Jul 2008 12:02:46 -0000 1.81
+++ rpm/python/Makefile.am 19 Aug 2008 20:51:45 -0000 1.82
@@ -4,12 +4,7 @@
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) \
@@ -24,7 +19,7 @@
@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 \
@@ -32,7 +27,12 @@
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 \
@@ -40,15 +40,6 @@
$(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\
@@ .
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
