From: Nicholas Nethercote <njn@valgrind.org>
Date: Tue, 27 Sep 2005 20:27:04 +0000 (+0000)
Subject: Fix up Makefile.core.am which got a little confused during the ASPACEM
X-Git-Tag: svn/VALGRIND_3_1_0~434
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9c2f2f027e550b4225da62732da54a3dbc5a7ff;p=thirdparty%2Fvalgrind.git

Fix up Makefile.core.am which got a little confused during the ASPACEM
merging.



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

diff --git a/Makefile.core-AM_CPPFLAGS.am b/Makefile.core-AM_CPPFLAGS.am
deleted file mode 100644
index 1859e0c59c..0000000000
--- a/Makefile.core-AM_CPPFLAGS.am
+++ /dev/null
@@ -1,19 +0,0 @@
-add_includes = -I$(top_srcdir)/coregrind \
-		-I$(top_srcdir) \
-		-I$(top_srcdir)/coregrind/$(VG_ARCH) \
-		-I$(top_srcdir)/coregrind/$(VG_OS) \
-		-I$(top_srcdir)/coregrind/$(VG_PLATFORM) \
-		-I$(top_srcdir)/include \
-		-I@VEX_DIR@/pub \
-		-DVGA_$(VG_ARCH)=1 \
-		-DVGO_$(VG_OS)=1 \
-		-DVGP_$(VG_ARCH)_$(VG_OS)=1
-
-BASE_AM_CFLAGS = @ARCH_CORE_AM_CFLAGS@ -Wmissing-prototypes -Winline -Wall -Wshadow -O -g
-
-PIC_AM_CFLAGS = $(BASE_AM_CFLAGS) -fpic -fno-omit-frame-pointer
-
-AM_CPPFLAGS = $(add_includes)
-AM_CFLAGS = $(WERROR) $(BASE_AM_CFLAGS)
-AM_CCASFLAGS = $(add_includes) @ARCH_CORE_AM_CCASFLAGS@ -Wa,-gstabs
-
diff --git a/Makefile.core.am b/Makefile.core.am
index bc7211ea7e..1859e0c59c 100644
--- a/Makefile.core.am
+++ b/Makefile.core.am
@@ -14,6 +14,6 @@ BASE_AM_CFLAGS = @ARCH_CORE_AM_CFLAGS@ -Wmissing-prototypes -Winline -Wall -Wsha
 PIC_AM_CFLAGS = $(BASE_AM_CFLAGS) -fpic -fno-omit-frame-pointer
 
 AM_CPPFLAGS = $(add_includes)
-AM_CFLAGS = $(WERROR) @PIE_AM_CFLAGS@ $(BASE_AM_CFLAGS)
+AM_CFLAGS = $(WERROR) $(BASE_AM_CFLAGS)
 AM_CCASFLAGS = $(add_includes) @ARCH_CORE_AM_CCASFLAGS@ -Wa,-gstabs
 
diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index 5a0f7a0d24..20c883fd85 100644
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
+include $(top_srcdir)/Makefile.core.am
 
 bin_PROGRAMS = valgrind-listener
 
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index f03e96f02c..65d4a16b7f 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
+include $(top_srcdir)/Makefile.core.am
 
 AM_CPPFLAGS += -DVG_LIBDIR="\"$(valdir)"\" \
 		-DKICKSTART_BASE=@KICKSTART_BASE@