Use $(top_builddir) for inclusion of make.tmpl in Makefiles.

5 files changed, 24 insertions, 24 deletions

diff --git a/old-tests/device/Makefile.in b/old-tests/device/Makefile.in
index 4bf15a9a..5c9479e3 100644
--- a/old-tests/device/Makefile.in
+++ b/old-tests/device/Makefile.in
@@ -22,8 +22,8 @@ SOURCES=\
 
 TARGETS=dev_cache_t
 
-include ../../make.tmpl
+include $(top_builddir)/make.tmpl
 
 dev_cache_t: dev_cache_t.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o dev_cache_t dev_cache_t.o -L$(top_srcdir)/lib -llvm
+	$(CC) -o dev_cache_t dev_cache_t.o -L$(top_builddir)/lib -llvm
 
diff --git a/old-tests/filters/Makefile.in b/old-tests/filters/Makefile.in
index 01de934b..62e13c04 100644
--- a/old-tests/filters/Makefile.in
+++ b/old-tests/filters/Makefile.in
@@ -25,11 +25,11 @@ TARGETS=\
 	rfilter_t \
 	pfilter_t
 
-include ../../make.tmpl
+include $(top_builddir)/make.tmpl
 
 rfilter_t: rfilter_t.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o rfilter_t rfilter_t.o -L$(top_srcdir)/lib -llvm
+	$(CC) -o rfilter_t rfilter_t.o -L$(top_builddir)/lib -llvm
 
 pfilter_t: pfilter_t.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o pfilter_t pfilter_t.o -L$(top_srcdir)/lib -llvm
+	$(CC) -o pfilter_t pfilter_t.o -L$(top_builddir)/lib -llvm
 
diff --git a/old-tests/format1/Makefile.in b/old-tests/format1/Makefile.in
index 1ccb56d8..b82e065f 100644
--- a/old-tests/format1/Makefile.in
+++ b/old-tests/format1/Makefile.in
@@ -32,21 +32,21 @@ TARGETS=\
 	read_pv_t \
 	get_vgs_t
 
-include ../../make.tmpl
+include $(top_builddir)/make.tmpl
 
-read_vg_t: read_vg_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o read_vg_t read_vg_t.o pretty_print.o -L$(top_srcdir)/lib -llvm
+read_vg_t: read_vg_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
+	$(CC) -o read_vg_t read_vg_t.o pretty_print.o -L$(top_builddir)/lib -llvm
 
-write_vg_t: write_vg_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a
+write_vg_t: write_vg_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
 	$(CC) -o write_vg_t write_vg_t.o pretty_print.o \
-	-L$(top_srcdir)/lib -llvm
+	-L$(top_builddir)/lib -llvm
 
-get_pvs_t: get_pvs_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o get_pvs_t get_pvs_t.o pretty_print.o -L$(top_srcdir)/lib -llvm
+get_pvs_t: get_pvs_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
+	$(CC) -o get_pvs_t get_pvs_t.o pretty_print.o -L$(top_builddir)/lib -llvm
 
-read_pv_t: read_pv_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o read_pv_t read_pv_t.o pretty_print.o -L$(top_srcdir)/lib -llvm
+read_pv_t: read_pv_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
+	$(CC) -o read_pv_t read_pv_t.o pretty_print.o -L$(top_builddir)/lib -llvm
 
-get_vgs_t: get_vgs_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o get_vgs_t get_vgs_t.o pretty_print.o -L$(top_srcdir)/lib -llvm
+get_vgs_t: get_vgs_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
+	$(CC) -o get_vgs_t get_vgs_t.o pretty_print.o -L$(top_builddir)/lib -llvm
 
diff --git a/old-tests/mm/Makefile.in b/old-tests/mm/Makefile.in
index 997f0d34..62c341f9 100644
--- a/old-tests/mm/Makefile.in
+++ b/old-tests/mm/Makefile.in
@@ -22,12 +22,12 @@ SOURCES=\
 
 TARGETS=dbg_malloc_t
 
-include ../../make.tmpl
+include $(top_builddir)/make.tmpl
 
 dbg_malloc_t: dbg_malloc_t.o
 	$(CC) $(CFLAGS) -o dbg_malloc_t dbg_malloc_t.o \
-		-L$(top_srcdir)/lib -llvm
+		-L$(top_builddir)/lib -llvm
 
 pool_t: pool_t.o
-	$(CC) $(CFLAGS) -o pool_t pool_t.o -L$(top_srcdir)/lib -llvm
+	$(CC) $(CFLAGS) -o pool_t pool_t.o -L$(top_builddir)/lib -llvm
 
diff --git a/old-tests/regex/Makefile.in b/old-tests/regex/Makefile.in
index 28783ae1..7696c484 100644
--- a/old-tests/regex/Makefile.in
+++ b/old-tests/regex/Makefile.in
@@ -25,11 +25,11 @@ TARGETS=\
 	parse_t \
 	matcher_t
 
-include ../../make.tmpl
+include $(top_builddir)/make.tmpl
 
-parse_t: parse_t.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o parse_t parse_t.o -L$(top_srcdir)/lib -llvm
+parse_t: parse_t.o $(top_builddir)/lib/liblvm.a
+	$(CC) -o parse_t parse_t.o -L$(top_builddir)/lib -llvm
 
-matcher_t: matcher_t.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o matcher_t matcher_t.o -L$(top_srcdir)/lib -llvm
+matcher_t: matcher_t.o $(top_builddir)/lib/liblvm.a
+	$(CC) -o matcher_t matcher_t.o -L$(top_builddir)/lib -llvm