summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2011-09-05 10:42:38 -0400
committerJiri Olsa <Jiri Olsa jolsa@redhat.com>2011-09-11 14:29:44 +0200
commit01166acb9da9ea2aea40349c44d78764f8e2f3cd (patch)
tree2f6031928a95d6b521b19f1d2805556c2c59b9f9
parentec7b135b14d7ba1166859dd8436beee9c83971aa (diff)
downloadlatrace-01166acb9da9ea2aea40349c44d78764f8e2f3cd.tar.gz
latrace-01166acb9da9ea2aea40349c44d78764f8e2f3cd.tar.xz
latrace-01166acb9da9ea2aea40349c44d78764f8e2f3cd.zip
make: Fixes paraller building like 'make -j16'
-rw-r--r--ChangeLog4
-rw-r--r--test/Makefile6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a00346..65dff9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-05 Jiri Olsa <olsajiri@gmail.com>
+ * Fixes paraller building like 'make -j16'
+ (contributed by Tapani Pälli <tapani.palli@intel.com>)
+
-------------------------------------------------------------------------------
latrace 0.5.11
diff --git a/test/Makefile b/test/Makefile
index 418760e..4ae134c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -16,16 +16,16 @@ lib-test-libsym2.so: test/lib-test-libsym2.o
lib-test-libsym3.so: test/lib-test-libsym3.o
$(QUIET_LD)$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $^
-test-common: test/test-lib.o test/test-common.o
+test-common: lib-test-common.so test/test-lib.o test/test-common.o
$(QUIET_LD)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ lib-test-common.so
-test-args: test/test-lib.o test/test-args.o test/sysdeps/$(CONFIG_SYSDEP_DIR)/test-args.o
+test-args: lib-test-args.so test/test-lib.o test/test-args.o test/sysdeps/$(CONFIG_SYSDEP_DIR)/test-args.o
$(QUIET_LD)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ lib-test-args.so
test-kill: test/test-kill.o
$(QUIET_LD)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-test-libsym: test/test-libsym.o test/test-lib.o
+test-libsym: lib-test-libsym1.so lib-test-libsym2.so lib-test-libsym3.so test/test-libsym.o test/test-lib.o
$(QUIET_LD)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ lib-test-libsym1.so lib-test-libsym2.so lib-test-libsym3.so
OBJS+=test/test-lib.o