-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:=./
MSGSRC:=./xapp-mgmt
ASNSRC:=../asn1c_defs
-E2APSRC:=./xapp-asn/e2ap
-E2SMSRC:=./xapp-asn/e2sm
+E2APSRC:=./xapp-formats/e2ap
+E2SMSRC:=./xapp-formats/e2sm
####### Logging library and flags
CLOGFLAGS:= `pkg-config mdclog --cflags`
LOG_LIBS:= `pkg-config mdclog --libs`
CURL_LIBS:= `pkg-config libcurl --libs`
-
+RNIB_LIBS:= -pthread /usr/local/lib/rnibreader_old.a
######## 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./
E2SMFLAGS = -I$(E2SMSRC)
########libs
-LIBS= -lsdl -lrmr_nng -lnng -lpthread -lm $(LOG_LIBS) $(CURL_LIBS)
+
+LIBS= -lsdl -lrmr_nng -lnng -lpthread -lm $(LOG_LIBS) $(CURL_LIBS) $(RNIB_LIBS)
COV_FLAGS= -fprofile-arcs -ftest-coverage
#######
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