diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2009-02-24 15:25:11 +0100 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2009-02-24 15:25:11 +0100 |
| commit | 514a6b10ac9eb1f75f0001bffc4d717245ad7f63 (patch) | |
| tree | 3b0bddb7b9be61e77f834a2c39b948ba145d36ce /makefiles | |
| parent | c8808247d13af4a326e69e9c81f8dbf9a62af610 (diff) | |
| download | wolfbones-514a6b10ac9eb1f75f0001bffc4d717245ad7f63.tar.gz wolfbones-514a6b10ac9eb1f75f0001bffc4d717245ad7f63.tar.bz2 | |
fixed TEST targets in daemon for icc
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/compiler.mk | 4 | ||||
| -rw-r--r-- | makefiles/sub.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/makefiles/compiler.mk b/makefiles/compiler.mk index 581f9c6..3409d4c 100644 --- a/makefiles/compiler.mk +++ b/makefiles/compiler.mk @@ -206,8 +206,8 @@ CCPP_LINK = $(CCPP) %.o : %.cpp $(CCPP) -c -o $@ $(CCPPFLAGS) $< -%$(EXE): %.o $(OBJS) - $(LINK) -o $@ $(LDFLAGS) $(OBJS) $< $(LIBS) +%$(EXE): %.o $(OBJS) $(TEST_OBJS) + $(LINK) -o $@ $(LDFLAGS) $(OBJS) $(TEST_OBJS) $< $(LIBS) %.sho : %.c $(CC) -c -o $@ -fPIC -DSHARED $(CFLAGS) $< diff --git a/makefiles/sub.mk b/makefiles/sub.mk index 567e144..cfb2490 100644 --- a/makefiles/sub.mk +++ b/makefiles/sub.mk @@ -17,7 +17,7 @@ all: $(OBJS) $(CPPOBJS) $(BIN_OBJS) $(CPP_BIN_OBJS) $(BINS) $(CPP_BINS) $(CMODUL (set -e; $(MAKE) -C $$d all || exit 1); done) .PHONY: test local_test -test: $(OBJS) $(CPPOBJS) $(BIN_OBJS) $(BINS) $(CPP_BINS) $(TEST_BINS) $(TEST_CPP_BINS) $(CMODULES) $(CPPMODULES) local_test +test: $(OBJS) $(TEST_OBJS) $(CPPOBJS) $(BIN_OBJS) $(BINS) $(CPP_BINS) $(TEST_BINS) $(TEST_CPP_BINS) $(CMODULES) $(CPPMODULES) local_test @test -z "$(SUBDIRS)" || ( set -e; for d in $(SUBDIRS)""; do \ (set -e; $(MAKE) -C $$d test || exit 1); done) |