|
From: Jeremy F. <je...@go...> - 2005-01-24 21:59:23
|
CVS commit by fitzhardinge:
Fix up various build issues. This allows building outside the source tree, and fixes
"make dist" and RPM building.
BUG: 97792
CC: ch...@at...
M +1 -0 Makefile.core-AM_CPPFLAGS.am 1.9
M +1 -2 valgrind.spec.in 1.19
M +2 -2 memcheck/tests/Makefile.am 1.65
M +3 -3 none/tests/Makefile.am 1.61
--- valgrind/Makefile.core-AM_CPPFLAGS.am #1.8:1.9
@@ -1,3 +1,4 @@
add_includes = -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind \
+ -I$(top_srcdir) \
-I$(top_srcdir)/coregrind/$(VG_ARCH) \
-I$(top_srcdir)/coregrind/$(VG_OS) \
--- valgrind/valgrind.spec.in #1.18:1.19
@@ -47,7 +47,6 @@
/usr/bin/valgrind
/usr/bin/cg_annotate
-/usr/lib/valgrind
-/usr/lib/valgrind/*
/usr/bin/valgrind-listener
+/usr/lib/valgrind
/usr/lib/pkgconfig/valgrind.pc
--- valgrind/none/tests/Makefile.am #1.60:1.61
@@ -78,5 +78,5 @@
AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
-AM_CPPFLAGS = -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CXXFLAGS = $(AM_CFLAGS)
@@ -128,10 +128,10 @@
tls_SOURCES = tls.c tls2.c
tls_DEPENDENCIES = tls.so
-tls_LDFLAGS = -Wl,-rpath,$(srcdir)
+tls_LDFLAGS = -Wl,-rpath,$(top_builddir)/none/tests
tls_LDADD = tls.so -lpthread
tls_so_SOURCES = tls_so.c
tls_so_LDADD = tls2.so
tls_so_DEPENDENCIES = tls2.so
-tls_so_LDFLAGS = -Wl,-rpath,$(srcdir) -shared
+tls_so_LDFLAGS = -Wl,-rpath,$(top_builddir)/none/tests -shared
tls2_so_SOURCES = tls2_so.c
tls2_so_LDFLAGS = -shared
--- valgrind/memcheck/tests/Makefile.am #1.64:1.65
@@ -50,5 +50,5 @@
null_socket.stderr.exp null_socket.vgtest \
overlap.stderr.exp overlap.stdout.exp overlap.vgtest \
- post-syscall.stderr.exp post-syscall.stderr.out post-syscall.vgtest \
+ post-syscall.stderr.exp post-syscall.stdout.exp post-syscall.vgtest \
pth_once.stderr.exp pth_once.stdout.exp pth_once.vgtest \
realloc1.stderr.exp realloc1.vgtest \
@@ -99,5 +99,5 @@
-AM_CPPFLAGS = -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
AM_CXXFLAGS = $(AM_CFLAGS)
|