|
From: <sv...@va...> - 2005-09-27 20:27:09
|
Author: njn Date: 2005-09-27 21:27:04 +0100 (Tue, 27 Sep 2005) New Revision: 4794 Log: Fix up Makefile.core.am which got a little confused during the ASPACEM merging. Removed: trunk/Makefile.core-AM_CPPFLAGS.am Modified: trunk/Makefile.core.am trunk/auxprogs/Makefile.am trunk/coregrind/Makefile.am Deleted: trunk/Makefile.core-AM_CPPFLAGS.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/Makefile.core-AM_CPPFLAGS.am 2005-09-27 20:05:45 UTC (rev 4793) +++ trunk/Makefile.core-AM_CPPFLAGS.am 2005-09-27 20:27:04 UTC (rev 4794) @@ -1,19 +0,0 @@ -add_includes =3D -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)=3D1 \ - -DVGO_$(VG_OS)=3D1 \ - -DVGP_$(VG_ARCH)_$(VG_OS)=3D1 - -BASE_AM_CFLAGS =3D @ARCH_CORE_AM_CFLAGS@ -Wmissing-prototypes -Winline -= Wall -Wshadow -O -g - -PIC_AM_CFLAGS =3D $(BASE_AM_CFLAGS) -fpic -fno-omit-frame-pointer - -AM_CPPFLAGS =3D $(add_includes) -AM_CFLAGS =3D $(WERROR) $(BASE_AM_CFLAGS) -AM_CCASFLAGS =3D $(add_includes) @ARCH_CORE_AM_CCASFLAGS@ -Wa,-gstabs - Modified: trunk/Makefile.core.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/Makefile.core.am 2005-09-27 20:05:45 UTC (rev 4793) +++ trunk/Makefile.core.am 2005-09-27 20:27:04 UTC (rev 4794) @@ -14,6 +14,6 @@ PIC_AM_CFLAGS =3D $(BASE_AM_CFLAGS) -fpic -fno-omit-frame-pointer =20 AM_CPPFLAGS =3D $(add_includes) -AM_CFLAGS =3D $(WERROR) @PIE_AM_CFLAGS@ $(BASE_AM_CFLAGS) +AM_CFLAGS =3D $(WERROR) $(BASE_AM_CFLAGS) AM_CCASFLAGS =3D $(add_includes) @ARCH_CORE_AM_CCASFLAGS@ -Wa,-gstabs =20 Modified: trunk/auxprogs/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/auxprogs/Makefile.am 2005-09-27 20:05:45 UTC (rev 4793) +++ trunk/auxprogs/Makefile.am 2005-09-27 20:27:04 UTC (rev 4794) @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.all.am -include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am +include $(top_srcdir)/Makefile.core.am =20 bin_PROGRAMS =3D valgrind-listener =20 Modified: trunk/coregrind/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coregrind/Makefile.am 2005-09-27 20:05:45 UTC (rev 4793) +++ trunk/coregrind/Makefile.am 2005-09-27 20:27:04 UTC (rev 4794) @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.all.am -include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am +include $(top_srcdir)/Makefile.core.am =20 AM_CPPFLAGS +=3D -DVG_LIBDIR=3D"\"$(valdir)"\" \ -DKICKSTART_BASE=3D@KICKSTART_BASE@ |