From 40d68949100d534e4dea766c7f8f60ed36aa4429 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 18 Sep 2012 23:38:21 -0400 Subject: buildsys: eschew use of DEFS, prefer AM_CPPFLAGS This is redundant, and any usage of -D should belong to CPPFLAGS. Signed-off-by: Dave Reisner Signed-off-by: Allan McRae --- src/pacman/Makefile.am | 18 ++++++++---------- src/util/Makefile.am | 14 ++++++-------- 2 files changed, 14 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index c8ce9773..d296d485 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -9,23 +9,21 @@ logfile = ${localstatedir}/log/pacman.log bin_PROGRAMS = pacman -DEFS = -DLOCALEDIR=\"@localedir@\" \ - -DCONFFILE=\"$(conffile)\" \ - -DDBPATH=\"$(dbpath)\" \ - -DGPGDIR=\"$(gpgdir)\" \ - -DCACHEDIR=\"$(cachedir)\" \ - -DLOGFILE=\"$(logfile)\" \ - @DEFS@ - AM_CPPFLAGS = \ -imacros $(top_builddir)/config.h \ - -I$(top_srcdir)/lib/libalpm + -I$(top_srcdir)/lib/libalpm \ + -DLOCALEDIR=\"@localedir@\" \ + -DCONFFILE=\"$(conffile)\" \ + -DDBPATH=\"$(dbpath)\" \ + -DGPGDIR=\"$(gpgdir)\" \ + -DCACHEDIR=\"$(cachedir)\" \ + -DLOGFILE=\"$(logfile)\" AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') -DEFS += -DGIT_VERSION=\"$(GIT_VERSION)\" +AM_CPPFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" endif pacman_SOURCES = \ diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 463abf7f..d539fa26 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -6,16 +6,14 @@ cachedir = ${localstatedir}/cache/pacman/pkg/ bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree -DEFS = -DLOCALEDIR=\"@localedir@\" \ - -DCONFFILE=\"$(conffile)\" \ - -DDBPATH=\"$(dbpath)\" \ - -DGPGDIR=\"$(gpgdir)\" \ - -DCACHEDIR=\"$(cachedir)\" \ - @DEFS@ - AM_CPPFLAGS = \ -imacros $(top_builddir)/config.h \ - -I$(top_srcdir)/lib/libalpm + -I$(top_srcdir)/lib/libalpm \ + -DLOCALEDIR=\"@localedir@\" \ + -DCONFFILE=\"$(conffile)\" \ + -DDBPATH=\"$(dbpath)\" \ + -DGPGDIR=\"$(gpgdir)\" \ + -DCACHEDIR=\"$(cachedir)\" AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) -- cgit v1.2.3-70-g09d2