Use $(srcdir) to specify the location of the linker script

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

diff --git a/Makefile.am b/Makefile.am
index fc0d5891ae907ed7da76e1aedab2f056cadda8e3..257be0bdcfcae9fbc5a8aa8d855d38104e38dac3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,9 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
 
-vg_libpthread.vs:
-       echo Not making vg_libpthread.vs
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
@@ -96,10 +93,10 @@ valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
 valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
        $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
 
-libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) vg_libpthread.vs
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
                $(libpthread_so_OBJECTS) \
-               -Wl,-version-script vg_libpthread.vs
+               -Wl,-version-script $(srcdir)/vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index fc0d5891ae907ed7da76e1aedab2f056cadda8e3..257be0bdcfcae9fbc5a8aa8d855d38104e38dac3 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -80,9 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
 
-vg_libpthread.vs:
-       echo Not making vg_libpthread.vs
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
@@ -96,10 +93,10 @@ valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
 valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
        $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
 
-libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) vg_libpthread.vs
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
                $(libpthread_so_OBJECTS) \
-               -Wl,-version-script vg_libpthread.vs
+               -Wl,-version-script $(srcdir)/vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index fc0d5891ae907ed7da76e1aedab2f056cadda8e3..257be0bdcfcae9fbc5a8aa8d855d38104e38dac3 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -80,9 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
 
-vg_libpthread.vs:
-       echo Not making vg_libpthread.vs
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
@@ -96,10 +93,10 @@ valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
 valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
        $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
 
-libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) vg_libpthread.vs
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
                $(libpthread_so_OBJECTS) \
-               -Wl,-version-script vg_libpthread.vs
+               -Wl,-version-script $(srcdir)/vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index fc0d5891ae907ed7da76e1aedab2f056cadda8e3..257be0bdcfcae9fbc5a8aa8d855d38104e38dac3 100644 (file)
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -80,9 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
 
-vg_libpthread.vs:
-       echo Not making vg_libpthread.vs
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
@@ -96,10 +93,10 @@ valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
 valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
        $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
 
-libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) vg_libpthread.vs
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
                $(libpthread_so_OBJECTS) \
-               -Wl,-version-script vg_libpthread.vs
+               -Wl,-version-script $(srcdir)/vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index fc0d5891ae907ed7da76e1aedab2f056cadda8e3..257be0bdcfcae9fbc5a8aa8d855d38104e38dac3 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -80,9 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
 
-vg_libpthread.vs:
-       echo Not making vg_libpthread.vs
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
@@ -96,10 +93,10 @@ valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
 valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
        $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
 
-libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) vg_libpthread.vs
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
                $(libpthread_so_OBJECTS) \
-               -Wl,-version-script vg_libpthread.vs
+               -Wl,-version-script $(srcdir)/vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index fc0d5891ae907ed7da76e1aedab2f056cadda8e3..257be0bdcfcae9fbc5a8aa8d855d38104e38dac3 100644 (file)
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -80,9 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
 
-vg_libpthread.vs:
-       echo Not making vg_libpthread.vs
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
@@ -96,10 +93,10 @@ valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
 valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
        $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
 
-libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) vg_libpthread.vs
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
                $(libpthread_so_OBJECTS) \
-               -Wl,-version-script vg_libpthread.vs
+               -Wl,-version-script $(srcdir)/vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index fc0d5891ae907ed7da76e1aedab2f056cadda8e3..257be0bdcfcae9fbc5a8aa8d855d38104e38dac3 100644 (file)
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -80,9 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
 
-vg_libpthread.vs:
-       echo Not making vg_libpthread.vs
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
@@ -96,10 +93,10 @@ valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
 valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
        $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
 
-libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) vg_libpthread.vs
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
                $(libpthread_so_OBJECTS) \
-               -Wl,-version-script vg_libpthread.vs
+               -Wl,-version-script $(srcdir)/vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index fc0d5891ae907ed7da76e1aedab2f056cadda8e3..257be0bdcfcae9fbc5a8aa8d855d38104e38dac3 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -80,9 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
 
-vg_libpthread.vs:
-       echo Not making vg_libpthread.vs
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
@@ -96,10 +93,10 @@ valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
 valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
        $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
 
-libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) vg_libpthread.vs
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
                $(libpthread_so_OBJECTS) \
-               -Wl,-version-script vg_libpthread.vs
+               -Wl,-version-script $(srcdir)/vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)

diff --git a/none/Makefile.am b/none/Makefile.am
index fc0d5891ae907ed7da76e1aedab2f056cadda8e3..257be0bdcfcae9fbc5a8aa8d855d38104e38dac3 100644 (file)
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -80,9 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) 
 
-vg_libpthread.vs:
-       echo Not making vg_libpthread.vs
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
@@ -96,10 +93,10 @@ valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
 valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
        $(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
 
-libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) vg_libpthread.vs
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS) $(srcdir)/vg_libpthread.vs
        $(CC) -Wall -Werror -g -O -shared -fpic -o libpthread.so \
                $(libpthread_so_OBJECTS) \
-               -Wl,-version-script vg_libpthread.vs
+               -Wl,-version-script $(srcdir)/vg_libpthread.vs
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)