projects
/
satcheck.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fdc0387
)
Fix build of test directory
author
bdemsky
<bdemsky@uci.edu>
Thu, 15 Dec 2016 01:02:28 +0000
(17:02 -0800)
committer
bdemsky
<bdemsky@uci.edu>
Thu, 15 Dec 2016 01:02:28 +0000
(17:02 -0800)
common.mk
patch
|
blob
|
history
test/Makefile
patch
|
blob
|
history
diff --git
a/common.mk
b/common.mk
index b91369fe113d94a94dc46317c450fd4b7ec2fa5c..763ccd04a2ef697b70df6aed891833cc40680d6e 100644
(file)
--- a/
common.mk
+++ b/
common.mk
@@
-8,6
+8,7
@@
UNAME := $(shell uname)
LIB_NAME := model
TSO_LIB_SO := libtso_$(LIB_NAME).so
SC_LIB_SO := libsc_$(LIB_NAME).so
LIB_NAME := model
TSO_LIB_SO := libtso_$(LIB_NAME).so
SC_LIB_SO := libsc_$(LIB_NAME).so
+TEST_LIB_SO := sc_model
CPPFLAGS += -Wall -g -O3
CPPFLAGS += -Wall -g -O3
diff --git
a/test/Makefile
b/test/Makefile
index 2a44231abd7d0625e4a6f336e75eea233fb96ee7..5f73159cfdbd7f48480ac468f2bf2259998a683b 100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-14,10
+14,10
@@
all: $(OBJECTS)
-include $(DEPS)
%.o: %.c
-include $(DEPS)
%.o: %.c
- $(CC) -MMD -MF $(@D)/.$(@F).d -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(
LIB_NAME
)
+ $(CC) -MMD -MF $(@D)/.$(@F).d -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(
TEST_LIB_SO
)
%.o: %.cc
%.o: %.cc
- $(CXX) -MMD -MF $(@D)/.$(@F).d -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(
LIB_NAME
)
+ $(CXX) -MMD -MF $(@D)/.$(@F).d -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(
TEST_LIB_SO
)
clean::
rm -f $(OBJECTS) $(DEPS)
clean::
rm -f $(OBJECTS) $(DEPS)