Code Review
/
ric-app
/
hw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Release push 1.0.2
[ric-app/hw.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index
700b0d5
..
c8a0b6d
100755
(executable)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,5
+1,5
@@
-CXX:= g++ --std=c++14 -O2
-CC:= gcc -O2
+CXX:= g++ --std=c++14 -O2
-L/usr/local/lib
+CC:= gcc -O2
-L/usr/local/lib
SRC:=./
HWSRC:=./
SRC:=./
HWSRC:=./
@@
-14,9
+14,11
@@
E2SMSRC:=./xapp-asn/e2sm
CLOGFLAGS:= `pkg-config mdclog --cflags`
LOG_LIBS:= `pkg-config mdclog --libs`
CURL_LIBS:= `pkg-config libcurl --libs`
CLOGFLAGS:= `pkg-config mdclog --cflags`
LOG_LIBS:= `pkg-config mdclog --libs`
CURL_LIBS:= `pkg-config libcurl --libs`
-
+RNIB_LIBS:= -pthread /usr/local/include/rnib/rnibreader.a
######## Keep include dirs separate so we have transparency
######## Keep include dirs separate so we have transparency
-BASEFLAGS= -Wall -std=c++14 $(CLOGFLAGS)
+
+
+BASEFLAGS= -Wall -std=c++14 $(CLOGFLAGS)
C_BASEFLAGS= -Wall $(CLOGFLAGS) -DASN_DISABLE_OER_SUPPORT
XAPPFLAGS= -I./
C_BASEFLAGS= -Wall $(CLOGFLAGS) -DASN_DISABLE_OER_SUPPORT
XAPPFLAGS= -I./
@@
-29,7
+31,8
@@
E2APFLAGS = -I$(E2APSRC)
E2SMFLAGS = -I$(E2SMSRC)
########libs
E2SMFLAGS = -I$(E2SMSRC)
########libs
-LIBS= -lsdl -lrmr_nng -lnng -lpthread -lm $(LOG_LIBS) $(CURL_LIBS)
+
+LIBS= -lsdl -lrmr_si -lpthread -lm $(LOG_LIBS) $(CURL_LIBS) $(RNIB_LIBS)
COV_FLAGS= -fprofile-arcs -ftest-coverage
#######
COV_FLAGS= -fprofile-arcs -ftest-coverage
#######
@@
-67,7
+70,7
@@
OBJ= $(HWXAPP_OBJ) $(UTIL_OBJ) $(MSG_OBJ) $(ASN1C_MODULES) $(E2AP_OBJ) $(E2SM_O
print-% : ; @echo $* = $($*)
hw_xapp_main: $(OBJ)
print-% : ; @echo $* = $($*)
hw_xapp_main: $(OBJ)
- $(CXX) -o $@ $(OBJ) $(LIBS) $(CPPFLAGS) $(CLOGFLAGS)
+ $(CXX) -o $@ $(OBJ) $(LIBS) $(
RNIBFLAGS) $(
CPPFLAGS) $(CLOGFLAGS)
install: hw_xapp_main
install -D hw_xapp_main /usr/local/bin/hw_xapp_main
install: hw_xapp_main
install -D hw_xapp_main /usr/local/bin/hw_xapp_main