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 lua Date: 26-Jun-2007 14:57:16
Branch: HEAD Handle: 2007062613571402
Modified files:
lua Makefile.am
rpm CHANGES Makefile.am
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/misc Makefile.am
rpm/python Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am
rpm/tools Makefile.am
Log:
cleanup Automake specifications by replacing old-style INCLUDES
variables with newer-style AM_CPPFLAGS ("automake -Wall" warns about it,
too).
Summary:
Revision Changes Path
1.10 +1 -1 lua/Makefile.am
1.1397 +1 -0 rpm/CHANGES
2.176 +1 -1 rpm/Makefile.am
2.58 +1 -1 rpm/build/Makefile.am
2.153 +1 -1 rpm/lib/Makefile.am
1.21 +1 -1 rpm/misc/Makefile.am
1.70 +1 -1 rpm/python/Makefile.am
1.59 +1 -1 rpm/rpmdb/Makefile.am
1.86 +1 -1 rpm/rpmio/Makefile.am
2.89 +1 -1 rpm/tools/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: lua/Makefile.am
============================================================================
$ cvs diff -u -r1.9 -r1.10 Makefile.am
--- lua/Makefile.am 19 Jun 2007 12:46:26 -0000 1.9
+++ lua/Makefile.am 26 Jun 2007 12:57:15 -0000 1.10
@@ -12,7 +12,7 @@
local/linit.lua
LDADD = liblua.la
-INCLUDES = -I$(srcdir)/include -I$(srcdir)/local -I$(includedir)
+AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/local -I$(includedir)
lua_lua_SOURCES = lua/lua.c
lua_lua_CFLAGS = -DLUA_USERCONFIG='"$(srcdir)/local/userconfig.c"'
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1396 -r1.1397 CHANGES
--- rpm/CHANGES 25 Jun 2007 08:14:09 -0000 1.1396
+++ rpm/CHANGES 26 Jun 2007 12:57:14 -0000 1.1397
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - rse: cleanup Automake specifications replace old-style INCLUDES with AM_CPPFLAGS
- rse: allow one to control/override the /usr/lib64 use via Autoconf option --enable-build-lib64
- rse: rename Autoconf --enable-ld-version-script to --enable-build-versionscript for consistency reasons
- rse: make PIC/PIE/warnings build flags controllable via Autoconf --enable-build-{pic,pie,warnings}
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.175 -r2.176 Makefile.am
--- rpm/Makefile.am 25 Jun 2007 06:22:00 -0000 2.175
+++ rpm/Makefile.am 26 Jun 2007 12:57:14 -0000 2.176
@@ -39,7 +39,7 @@
doc \
.
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.57 -r2.58 Makefile.am
--- rpm/build/Makefile.am 24 Jun 2007 18:12:30 -0000 2.57
+++ rpm/build/Makefile.am 26 Jun 2007 12:57:14 -0000 2.58
@@ -6,7 +6,7 @@
EXTRA_DIST = librpmbuild.vers
-INCLUDES = -I. \
+AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.152 -r2.153 Makefile.am
--- rpm/lib/Makefile.am 24 Jun 2007 18:12:30 -0000 2.152
+++ rpm/lib/Makefile.am 26 Jun 2007 12:57:14 -0000 2.153
@@ -4,7 +4,7 @@
LINT = splint
-INCLUDES = -I. \
+AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/rpmdb \
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.20 -r1.21 Makefile.am
--- rpm/misc/Makefile.am 24 Jun 2007 18:12:31 -0000 1.20
+++ rpm/misc/Makefile.am 26 Jun 2007 12:57:15 -0000 1.21
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = -I. -I$(top_srcdir)
+AM_CPPFLAGS = -I. -I$(top_srcdir)
EXTRA_DIST = \
alloca.c basename.c err.c error.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/Makefile.am
============================================================================
$ cvs diff -u -r1.69 -r1.70 Makefile.am
--- rpm/python/Makefile.am 24 Jun 2007 18:12:31 -0000 1.69
+++ rpm/python/Makefile.am 26 Jun 2007 12:57:15 -0000 1.70
@@ -11,7 +11,7 @@
EXTRA_DIST = system.h rpmdebug-py.c
-INCLUDES = -I. \
+AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.58 -r1.59 Makefile.am
--- rpm/rpmdb/Makefile.am 24 Jun 2007 18:12:31 -0000 1.58
+++ rpm/rpmdb/Makefile.am 26 Jun 2007 12:57:15 -0000 1.59
@@ -4,7 +4,7 @@
LINT = splint
-INCLUDES = -I. \
+AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.85 -r1.86 Makefile.am
--- rpm/rpmio/Makefile.am 25 Jun 2007 06:22:01 -0000 1.85
+++ rpm/rpmio/Makefile.am 26 Jun 2007 12:57:16 -0000 1.86
@@ -8,7 +8,7 @@
EXTRA_PROGRAMS = tax tdir tfts tget thkp tmacro tput tglob tinv tkey trpmio tsw dumpasn1 lookup3
-INCLUDES = -I. \
+AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/misc
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
============================================================================
$ cvs diff -u -r2.88 -r2.89 Makefile.am
--- rpm/tools/Makefile.am 24 Jun 2007 18:12:32 -0000 2.88
+++ rpm/tools/Makefile.am 26 Jun 2007 12:57:16 -0000 2.89
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = -I. \
+AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
@@ .
Received on Tue Jun 26 14:57:16 2007