Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-09-18 23:38:21 -0400
committerAllan McRae <allan@archlinux.org>2012-11-27 15:16:15 +1000
commit40d68949100d534e4dea766c7f8f60ed36aa4429 (patch)
tree855a3987b41b01724e575fdb9e91d1d1caee85c2
parent768c8ba100f1bdef9bb99f8ca619d23f055877ce (diff)
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 <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--configure.ac1
-rw-r--r--lib/libalpm/Makefile.am5
-rw-r--r--src/pacman/Makefile.am18
-rw-r--r--src/util/Makefile.am14
4 files changed, 16 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index eea2f98f..b823fab3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,7 +486,6 @@ ${PACKAGE_NAME}:
compiler : ${CC}
preprocessor flags : ${CPPFLAGS}
compiler flags : ${WARNING_CFLAGS} ${CFLAGS}
- defines : ${DEFS}
library flags : ${LIBS} ${LIBSSL_LIBS} ${LIBARCHIVE_LIBS} ${LIBCURL_LIBS} ${GPGME_LIBS}
linker flags : ${LDFLAGS}
diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index 911e52bf..c935e2db 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -5,10 +5,9 @@ SUBDIRS = po
lib_LTLIBRARIES = libalpm.la
include_HEADERS = alpm_list.h alpm.h
-DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@
-
AM_CPPFLAGS = \
- -imacros $(top_builddir)/config.h
+ -imacros $(top_builddir)/config.h \
+ -DLOCALEDIR=\"@localedir@\"
AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS)
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)