|
From: <sv...@va...> - 2009-06-23 02:07:49
|
Author: njn
Date: 2009-06-23 03:02:03 +0100 (Tue, 23 Jun 2009)
New Revision: 10362
Log:
Remove the last bit of cut+pastery.
Modified:
branches/BUILD_TWEAKS/Makefile.tool.am
branches/BUILD_TWEAKS/cachegrind/Makefile.am
branches/BUILD_TWEAKS/callgrind/Makefile.am
branches/BUILD_TWEAKS/drd/Makefile.am
branches/BUILD_TWEAKS/exp-ptrcheck/Makefile.am
branches/BUILD_TWEAKS/helgrind/Makefile.am
branches/BUILD_TWEAKS/lackey/Makefile.am
branches/BUILD_TWEAKS/massif/Makefile.am
branches/BUILD_TWEAKS/memcheck/Makefile.am
branches/BUILD_TWEAKS/none/Makefile.am
Modified: branches/BUILD_TWEAKS/Makefile.tool.am
===================================================================
--- branches/BUILD_TWEAKS/Makefile.tool.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/Makefile.tool.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -7,40 +7,25 @@
# <tool>-<platform> stuff
#----------------------------------------------------------------------------
-COREGRIND_LIBS_X86_LINUX = \
- $(top_builddir)/coregrind/libcoregrind-x86-linux.a \
- $(top_builddir)/VEX/libvex-x86-linux.a
+TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@ = \
+ $(top_builddir)/coregrind/libcoregrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a \
+ $(top_builddir)/VEX/libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
+if VGCONF_HAVE_PLATFORM_SEC
+TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ $(top_builddir)/coregrind/libcoregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a \
+ $(top_builddir)/VEX/libvex-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
+endif
-COREGRIND_LIBS_AMD64_LINUX = \
- $(top_builddir)/coregrind/libcoregrind-amd64-linux.a \
- $(top_builddir)/VEX/libvex-amd64-linux.a
-COREGRIND_LIBS_PPC32_LINUX = \
- $(top_builddir)/coregrind/libcoregrind-ppc32-linux.a \
- $(top_builddir)/VEX/libvex-ppc32-linux.a
+TOOL_LDADD_COMMON = -lgcc
+TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@ = \
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON)
+if VGCONF_HAVE_PLATFORM_SEC
+TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+endif
-COREGRIND_LIBS_PPC64_LINUX = \
- $(top_builddir)/coregrind/libcoregrind-ppc64-linux.a \
- $(top_builddir)/VEX/libvex-ppc64-linux.a
-COREGRIND_LIBS_PPC32_AIX5 = \
- $(top_builddir)/coregrind/libcoregrind-ppc32-aix5.a \
- $(top_builddir)/VEX/libvex-ppc32-aix5.a
-
-COREGRIND_LIBS_PPC64_AIX5 = \
- $(top_builddir)/coregrind/libcoregrind-ppc64-aix5.a \
- $(top_builddir)/VEX/libvex-ppc64-aix5.a
-
-COREGRIND_LIBS_X86_DARWIN = \
- $(top_builddir)/coregrind/libcoregrind-x86-darwin.a \
- $(top_builddir)/VEX/libvex-x86-darwin.a
-
-COREGRIND_LIBS_AMD64_DARWIN = \
- $(top_builddir)/coregrind/libcoregrind-amd64-darwin.a \
- $(top_builddir)/VEX/libvex-amd64-darwin.a
-
-
-TOOL_LDADD_COMMON = -lgcc
TOOL_LDFLAGS_COMMON_LINUX = -static \
-Wl,-defsym,valt_load_address=@VALT_LOAD_ADDRESS@ \
-nodefaultlibs -nostartfiles -u _start
@@ -48,35 +33,28 @@
TOOL_LDFLAGS_COMMON_DARWIN = -nodefaultlibs -nostartfiles \
-Wl,-u,__start -Wl,-e,__start -Wl,-bind_at_load /usr/lib/dyld
-TOOL_LDADD_X86_LINUX = $(COREGRIND_LIBS_X86_LINUX) $(TOOL_LDADD_COMMON)
TOOL_LDFLAGS_X86_LINUX = \
$(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ \
-Wl,-T,$(top_builddir)/valt_load_address_x86_linux.lds
-TOOL_LDADD_AMD64_LINUX = $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_COMMON)
TOOL_LDFLAGS_AMD64_LINUX = \
$(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M64@ \
-Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds
-TOOL_LDADD_PPC32_LINUX = $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_COMMON)
TOOL_LDFLAGS_PPC32_LINUX = \
$(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ \
-Wl,-T,$(top_builddir)/valt_load_address_ppc32_linux.lds
-TOOL_LDADD_PPC64_LINUX = $(COREGRIND_LIBS_PPC64_LINUX) $(TOOL_LDADD_COMMON)
TOOL_LDFLAGS_PPC64_LINUX = \
$(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M64@ \
-Wl,-T,$(top_builddir)/valt_load_address_ppc64_linux.lds
-TOOL_LDADD_PPC32_AIX5 = $(COREGRIND_LIBS_PPC32_AIX5) $(TOOL_LDADD_COMMON)
TOOL_LDFLAGS_PPC32_AIX5 = \
$(TOOL_LDFLAGS_COMMON_AIX5) @FLAG_MAIX32@
-TOOL_LDADD_PPC64_AIX5 = $(COREGRIND_LIBS_PPC64_AIX5) $(TOOL_LDADD_COMMON)
TOOL_LDFLAGS_PPC64_AIX5 = \
$(TOOL_LDFLAGS_COMMON_AIX5) @FLAG_MAIX64@ -Wl,-bbigtoc
-TOOL_LDADD_X86_DARWIN = $(COREGRIND_LIBS_X86_DARWIN) $(TOOL_LDADD_COMMON)
TOOL_LDFLAGS_X86_DARWIN = \
$(TOOL_LDFLAGS_COMMON_DARWIN) -arch i386 \
-Wl,-seg1addr,0xf0080000 \
@@ -85,7 +63,6 @@
# pagezero can't be unmapped and remapped. Use stack instead.
# GrP fixme no stack guard
-TOOL_LDADD_AMD64_DARWIN = $(COREGRIND_LIBS_AMD64_DARWIN) $(TOOL_LDADD_COMMON)
TOOL_LDFLAGS_AMD64_DARWIN = \
$(TOOL_LDFLAGS_COMMON_DARWIN) -arch x86_64 \
-Wl,-seg1addr,0x7fff55000000 \
@@ -171,6 +148,7 @@
-e '/^=====\+$$/,/.\*/d' \
-e '/\. = \(0x[0-9A-Fa-f]\+\|SEGMENT_START("[^"]\+", 0x[0-9A-Fa-f]\+)\) + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
|| rm -f $@
+
#----------------------------------------------------------------------------
# vgpreload_<tool>-<platform>.a stuff
#----------------------------------------------------------------------------
Modified: branches/BUILD_TWEAKS/cachegrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/cachegrind/Makefile.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/cachegrind/Makefile.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -45,7 +45,7 @@
cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \
@@ -58,7 +58,7 @@
cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \
Modified: branches/BUILD_TWEAKS/callgrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/callgrind/Makefile.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/callgrind/Makefile.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -53,7 +53,7 @@
callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(CALLGRIND_CFLAGS_COMMON)
callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \
@@ -66,7 +66,7 @@
callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(CALLGRIND_CFLAGS_COMMON)
callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \
Modified: branches/BUILD_TWEAKS/drd/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/drd/Makefile.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/drd/Makefile.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -67,7 +67,7 @@
drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(DRD_CFLAGS)
drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \
@@ -79,7 +79,7 @@
drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(DRD_CFLAGS)
drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \
Modified: branches/BUILD_TWEAKS/exp-ptrcheck/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/exp-ptrcheck/Makefile.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/exp-ptrcheck/Makefile.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -31,7 +31,7 @@
exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \
@@ -44,7 +44,7 @@
exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \
Modified: branches/BUILD_TWEAKS/helgrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/helgrind/Makefile.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/helgrind/Makefile.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -38,7 +38,7 @@
helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -O2
helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \
@@ -50,7 +50,7 @@
helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -O2
helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \
Modified: branches/BUILD_TWEAKS/lackey/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/lackey/Makefile.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/lackey/Makefile.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -17,7 +17,7 @@
lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \
@@ -29,7 +29,7 @@
lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \
Modified: branches/BUILD_TWEAKS/massif/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/massif/Makefile.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/massif/Makefile.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -21,7 +21,7 @@
massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \
@@ -33,7 +33,7 @@
massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \
Modified: branches/BUILD_TWEAKS/memcheck/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/memcheck/Makefile.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/memcheck/Makefile.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -35,7 +35,7 @@
memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -O2
memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \
@@ -47,7 +47,7 @@
memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -O2
memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \
Modified: branches/BUILD_TWEAKS/none/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/none/Makefile.am 2009-06-23 02:00:41 UTC (rev 10361)
+++ branches/BUILD_TWEAKS/none/Makefile.am 2009-06-23 02:02:03 UTC (rev 10362)
@@ -17,7 +17,7 @@
none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \
@@ -29,7 +29,7 @@
none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \
$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
- $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@)
+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \
$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \
|