From 1bd17a3d0f0ea30bf2080d045334a95ed78c2f79 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Mon, 23 Aug 2004 14:02:03 +0000 Subject: [PATCH] Remove a bunch of unnecessary -DVG_LIBDIR="\"$(libdir)"\" arguments in Makefile.am files. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2597 --- Makefile.am | 2 +- addrcheck/Makefile.am | 2 +- auxprogs/Makefile.am | 3 +-- cachegrind/Makefile.am | 3 +-- corecheck/Makefile.am | 3 +-- example/Makefile.am | 2 +- helgrind/Makefile.am | 3 +-- lackey/Makefile.am | 3 +-- massif/Makefile.am | 3 +-- memcheck/Makefile.am | 2 +- none/Makefile.am | 3 +-- 11 files changed, 11 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index 02e2c8566a..5453784f09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ SUBDIRS = include coregrind . docs tests auxprogs \ lackey \ none -AM_CPPFLAGS = -DVG_LIBDIR="\"$(libdir)"\" +AM_CPPFLAGS = AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am index f4f97c2670..df789a4714 100644 --- a/addrcheck/Makefile.am +++ b/addrcheck/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = . docs tests # include memcheck/ for mac_shared.h AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_srcdir)/memcheck -DVG_LIBDIR="\"$(libdir)"\" + -I$(top_srcdir)/memcheck AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am index d9d0b2dc05..bd46a4112a 100644 --- a/auxprogs/Makefile.am +++ b/auxprogs/Makefile.am @@ -2,8 +2,7 @@ SUBDIRS = . AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind \ - -DVG_LIBDIR="\"$(libdir)"\" + -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind AM_CFLAGS = $(WERROR) -Winline -Wall -O -g bin_PROGRAMS = valgrind-listener diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am index 0f0a5fea12..f1735bda67 100644 --- a/cachegrind/Makefile.am +++ b/cachegrind/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = . docs tests -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -DVG_LIBDIR="\"$(libdir)"\" +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am index 02880dcdb6..b790a83703 100644 --- a/corecheck/Makefile.am +++ b/corecheck/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = . tests docs -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -DVG_LIBDIR="\"$(libdir)"\" +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g diff --git a/example/Makefile.am b/example/Makefile.am index 3e800d3f4d..513eb0d49e 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = . -AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\" +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am index 09dc6a844c..05b4ea42eb 100644 --- a/helgrind/Makefile.am +++ b/helgrind/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = . docs tests -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -DVG_LIBDIR="\"$(libdir)"\" +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g diff --git a/lackey/Makefile.am b/lackey/Makefile.am index 7b0599b48f..7bbc4f25fb 100644 --- a/lackey/Makefile.am +++ b/lackey/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = . docs tests -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -DVG_LIBDIR="\"$(libdir)"\" +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g diff --git a/massif/Makefile.am b/massif/Makefile.am index 65a69383d4..bc2616143c 100644 --- a/massif/Makefile.am +++ b/massif/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = . tests docs hp2ps -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -DVG_LIBDIR="\"$(libdir)"\" +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am index 5d5fd15688..e46a5beb1f 100644 --- a/memcheck/Makefile.am +++ b/memcheck/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = . tests docs all_includes = -I$(top_builddir)/include -I$(top_srcdir)/include -AM_CPPFLAGS = $(all_includes) -DVG_LIBDIR="\"$(libdir)"\" +AM_CPPFLAGS = $(all_includes) AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O2 -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g AM_CCASFLAGS = $(all_includes) diff --git a/none/Makefile.am b/none/Makefile.am index 775a0cd9ba..f27ec45978 100644 --- a/none/Makefile.am +++ b/none/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = . docs tests -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -DVG_LIBDIR="\"$(libdir)"\" +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ -g -- 2.47.2