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/util/Makefile.am | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/util') 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