Code Review
/
ric-app
/
mc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Correct unit test invocation in cmake file
[ric-app/mc.git]
/
sidecars
/
listener
/
Makefile
diff --git
a/sidecars/listener/Makefile
b/sidecars/listener/Makefile
index
9c1bb8a
..
2490ffc
100644
(file)
--- a/
sidecars/listener/Makefile
+++ b/
sidecars/listener/Makefile
@@
-20,9
+20,11
@@
# this make file assuems that both NNG and RMR are installed and that the variables
# LD_LIBRARY_PATH, LIBRARY_PATH are set correctly.
# this make file assuems that both NNG and RMR are installed and that the variables
# LD_LIBRARY_PATH, LIBRARY_PATH are set correctly.
-binaries = mc_listener mc_listener_si
+# with the latest builder support for NNG was dropped, so we must build only SI95
+# based applications; the _si suffix has been dropped
+binaries = mc_listener
adjuncts = rdc_replay rdc_extract
adjuncts = rdc_replay rdc_extract
-testers = sender pipe_reader sender
_si
+testers = sender pipe_reader sender
test_progs = sender unit_test pipe_reader
lib_obj = mcl.o rdc.o
test_progs = sender unit_test pipe_reader
lib_obj = mcl.o rdc.o
@@
-37,33
+39,26
@@
libmcl.a:: $(lib_obj) $(lib_h)
ar -v -r libmcl.a $(lib_obj)
mc_listener: mc_listener.c libmcl.a
ar -v -r libmcl.a $(lib_obj)
mc_listener: mc_listener.c libmcl.a
- gcc mc_listener.c -o mc_listener -L. -lmcl -lrmr_nng -lnng -lm -lpthread
-
-mc_listener_si: mc_listener.c libmcl.a
- gcc mc_listener.c -o mc_listener_si -L. -lmcl -lrmr_si -lm -lpthread
-
+ gcc mc_listener.c -o mc_listener -L. -lmcl -lrmr_si -lm -lpthread
# ---- testing stuff -----------------------------------------------------------------
tests: $(test_progs)
sender : sender.c
# ---- testing stuff -----------------------------------------------------------------
tests: $(test_progs)
sender : sender.c
- gcc sender.c -o sender -lrmr_nng -lnng -lm -lpthread
-
-sender_si : sender.c
- gcc sender.c -o sender_si -lrmr_si -lm -lpthread
+ gcc sender.c -o sender -lrmr_si -lm -lpthread
pipe_reader : pipe_reader.c libmcl.a
pipe_reader : pipe_reader.c libmcl.a
- gcc pipe_reader.c -o pipe_reader -L. -lmcl -lrmr_
nng -lnng
-lm -lpthread
+ gcc pipe_reader.c -o pipe_reader -L. -lmcl -lrmr_
si
-lm -lpthread
unit_test: unit_test.c mcl.c
unit_test: unit_test.c mcl.c
- gcc -g $(coverage_opts) unit_test.c -o unit_test -lrmr_
nng -lnng
-lm -lpthread
+ gcc -g $(coverage_opts) unit_test.c -o unit_test -lrmr_
si
-lm -lpthread
# ---- adjunct tools -----------------------------------------------------------------
rdc_replay: rdc_replay.c libmcl.a
# ---- adjunct tools -----------------------------------------------------------------
rdc_replay: rdc_replay.c libmcl.a
- gcc rdc_replay.c -o rdc_replay -L. -lmcl -lrmr_
nng -lnng
-lpthread -lm
+ gcc rdc_replay.c -o rdc_replay -L. -lmcl -lrmr_
si
-lpthread -lm
rdc_extract: rdc_extract.c libmcl.a
rdc_extract: rdc_extract.c libmcl.a
- gcc rdc_extract.c -o rdc_extract -L. -lmcl -lrmr_
nng -lnng
-lpthread -lm
+ gcc rdc_extract.c -o rdc_extract -L. -lmcl -lrmr_
si
-lpthread -lm
# ---- housekeeping stuff -------------------------------------------------------------
# remove only intermediates
# ---- housekeeping stuff -------------------------------------------------------------
# remove only intermediates