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 (file)
index 1859e0c..0000000
--- 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 bc7211ea7e3aab0c0069863eb08ea0af33b8389e..1859e0c59c0b8ff585804faac4a396bae86df745 100644 (file)
--- 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 5a0f7a0d2499d8a4a0f290244fd3e4637b4c2dba..20c883fd851483189d0a78e196ce98b8b7ee520e 100644 (file)
--- 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 f03e96f02c51fc74f886c08da6a321b21eb5f6a4..65d4a16b7f4a93b7a3f8fff68827bc43afe1427b 100644 (file)
--- 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@