Remove a bunch of unnecessary -DVG_LIBDIR="\"$(libdir)"\" arguments in

Makefile.am files.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2597

diff --git a/Makefile.am b/Makefile.am
index 02e2c8566a9b3e32fc70d50a235b54d1c7a4ef25..5453784f0954da36f03f66478f82c4441c2ff557 100644 (file)
--- 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 f4f97c267050ababe35b29e013f3eb095b176033..df789a47148983623ab0761401dd749cf4adba57 100644 (file)
--- 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 d9d0b2dc050fa42032dc2205cd792485bf73d8cd..bd46a4112a8a3a7aaebaf955e7cc7ec645ecc871 100644 (file)
--- 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 0f0a5fea1236912969673dee6ac7d3021c420a61..f1735bda674bd884b439542661e6b34d6c9d6c2b 100644 (file)
--- 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 02880dcdb690d7c4c83b1d3becaabb941a2e5565..b790a837030583e6767863ba06cecefff48f36d5 100644 (file)
--- 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 3e800d3f4db932adecf0d6015e80a15492fe58e3..513eb0d49efff987c53b9fb283223dd77ea99393 100644 (file)
--- 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 09dc6a844c1f0dfd0f003f87feb7ab80852389db..05b4ea42eba8491f4e620328dc778a25a2cf1e2d 100644 (file)
--- 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 7b0599b48fe29b5e72ca4b2b507d52e3a6a3d731..7bbc4f25fbd2ce187e428e197588f2f65b54e377 100644 (file)
--- 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 65a69383d4c5552d35679b9799f4d3a0ce2ec0f4..bc2616143c0c434c76ea5c0440cd1050890f712d 100644 (file)
--- 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 5d5fd1568819aea5852bb11b7d82a5b68ff597f0..e46a5beb1f2461cfa95e59cc763e48f4ec47f142 100644 (file)
--- 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 775a0cd9baf6fd5f42dbbed35fceaddae10c8183..f27ec45978f37498a8a1fd6454d2748f61c552a6 100644 (file)
--- 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