diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-08-05 11:30:55 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-08-05 11:30:55 +0300 |
| commit | 8d2b416782e35fc439401f35166091fe0f9de038 (patch) | |
| tree | d5bcfc4878040d9e90fd62b8a0dd651ea9e7cef8 /rpmio | |
| parent | 6c4b0fc9e44ea3b9449e171404c1b2037d15d01e (diff) | |
| download | librpm-tizen-8d2b416782e35fc439401f35166091fe0f9de038.tar.gz librpm-tizen-8d2b416782e35fc439401f35166091fe0f9de038.tar.bz2 librpm-tizen-8d2b416782e35fc439401f35166091fe0f9de038.zip | |
Automake cleanups.
- Replace INCLUDES with AM_CPPFLAGS
(INCLUDES has been replaced by AM_CPPFLAGS and is deprecated in
modern automakes for several years)
- Require autoconf-2.61 and automake-1.10
(already required by autogen.sh)
- update mkinstalldirs with the version from automake-1.10
(The version in rpm is ancient and known to be bugged)
Patch from Ralf Corsepius
Diffstat (limited to 'rpmio')
| -rw-r--r-- | rpmio/Makefile.am | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 86e5f8233..29947660a 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -1,14 +1,12 @@ # Makefile for rpm library. -AUTOMAKE_OPTIONS = 1.4 foreign - LINT = splint EXTRA_DIST = tax.c tdigest.c tdir.c tficl.c tfts.c tget.c thkp.c tput.c tglob.c tinv.c tkey.c trpmio.c EXTRA_PROGRAMS = tax tdigest tdir tfts tget thkp tput tglob tinv tkey tring trpmio tsw -INCLUDES = -I. \ +AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ @WITH_BEECRYPT_INCLUDE@ \ @WITH_NEON_INCLUDE@ \ @@ -59,7 +57,7 @@ clean-local: #BUILT_SOURCES = rpmio.lcd rpmio.lcd: Makefile.am ${librpmio_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS} - -lclint -load ../beecrypt/beecrypt.lcd $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) -dump $@ 2>/dev/null + -lclint -load ../beecrypt/beecrypt.lcd $(DEFS) $(AM_CPPFLAGS) $(librpmio_la_SOURCES) -dump $@ 2>/dev/null .PHONY: sources sources: @@ -67,7 +65,7 @@ sources: .PHONY: lint lint: - $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) + $(LINT) $(DEFS) $(AM_CPPFLAGS) $(librpmio_la_SOURCES) tax_SOURCES = tax.c tax_LDADD = librpmio.la |