X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2FMakefile;h=828db9daeaeceabc601ec2fea03760b7a6e19805;hb=refs%2Fchanges%2F72%2F2072%2F1;hp=ab7ae574e583a7e0d54f754ec0cf2ca2b3e97a0c;hpb=b9d7e9c232a4371ddfed51c58e5a57f87b057229;p=ric-app%2Fadmin.git

diff --git a/src/Makefile b/src/Makefile
index ab7ae57..828db9d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,11 +6,11 @@ E2AP_c:=./E2AP-c
 E2SM := ./E2SM
 X2AP:=./X2AP
 SUBSCR:=$(E2AP_c)/subscription
-JSON := ./json
+
 PLUGININTERFACE :=./plugin-interface
 CURL := ./curl
 PLUGIN:=./protector-plugin
-ASN1C_DEFS:=../asn1c_defs/all-defs
+ASN1C_DEFS:=../asn1c_defs
 
 # Logging library and flags
 CLOGFLAGS:= `pkg-config mdclog --cflags`
@@ -23,7 +23,7 @@ BASEFLAGS=  -Wall  -std=c++14 $(CLOGFLAGS)
 XAPPFLAGS= -I./
 ASN1C_FLAGS=-I$(ASN1C_DEFS) -DASN_DISABLE_OER_SUPPORT
 SUBSCRFLAGS=  -I$(SUBSCR)
-JSONFLAGS=  -I$(JSON) 
+
 X2FLAGS=  -I$(X2AP) 
 PLUGINFLAGS = -I$(PLUGIN)
 PLUGININTERFACEFLAGS = -I$(PLUGININTERFACE)
@@ -38,10 +38,11 @@ COV_FLAGS= -fprofile-arcs -ftest-coverage
 XAPP_SRC= adm-ctrl-xapp.cc \
      xapp_utils.cc \
      message_processor_class.cc \
-     get_config.cc
+     get_config.cc \
+     admission_init_routines.cc
 
 CURL_SRC=$(wildcard $(CURL)/*.cc)
-JSON_SRC=$(wildcard $(JSON)/*.cc)
+
 SUBSCR_SRC= $(wildcard $(SUBSCR)/*.cc)
 X2AP_SRC = $(wildcard $(X2AP)/*.cc)
 PLUGINS_SRC = $(wildcard $(PLUGIN)/*.cc)
@@ -51,7 +52,7 @@ E2SM_SRC = $(wildcard $(E2SM)/*.cc)
 ASN1C_SRC= $(wildcard $(ASN1C_DEFS)/*.c)
 
 CURL_OBJ = $(CURL_SRC:.cc=.o)
-JSON_OBJ = $(JSON_SRC:.cc=.o)
+
 XAPP_OBJ= ${XAPP_SRC:.cc=.o} 
 SUBSCR_OBJ= ${SUBSCR_SRC:.cc=.o} 
 X2AP_OBJ= ${X2AP_SRC:.cc=.o}
@@ -63,16 +64,16 @@ ASN1C_MODULES = $(ASN1C_SRC:.c=.o)
 
 $(ASN1C_MODULES): export CFLAGS = $(C_BASEFLAGS) $(ASN1C_FLAGS)
 $(CURL_OBJ):export CPPFLAGS=$(BASEFLAGS) $(CURLFLAGS)
-$(JSON_OBJ):export CPPFLAGS= $(BASEFLAGS) $(JSONFLAGS)
-$(PLUGININTERFACE_OBJ):export CPPFLAGS=$(BASEFLAGS) $(PLUGININTERFACEFLAGS) $(JSONFLAGS)
+
+$(PLUGININTERFACE_OBJ):export CPPFLAGS=$(BASEFLAGS) $(PLUGININTERFACEFLAGS)
 $(SUBSCR_OBJ): export CPPFLAGS=$(BASEFLAGS) $(ASN1C_FLAGS) $(E2AP_C_FLAGS) $(SUBSCRFLAGS)
 $(E2AP_C_OBJ): export CPPFLAGS = $(BASEFLAGS) $(ASN1C_FLAGS) $(E2AP_C_FLAGS)
 $(E2SM_OBJ): export CPPFLAGS = $(BASEFLAGS) $(ASN1C_FLAGS) $(E2SM_FLAGS)
 $(X2AP_OBJ): export CPPFLAGS = $(BASEFLAGS) $(ASN1C_FLAGS) $(X2FLAGS)
-$(PLUGINS_OBJ): export CPPFLAGS = $(BASEFLAGS) $(ASN1C_FLAGS) $(X2FLAGS) $(PLUGINFLAGS) $(PLUGININTERFACEFLAGS) $(JSONFLAGS) 
-$(XAPP_OBJ):export CPPFLAGS=$(BASEFLAGS)  $(JSONFLAGS) $(SUBSCRFLAGS) $(PLUGINFLAGS) $(CURLFLAGS) $(E2AP_C_FLAGS) $(ASN1C_FLAGS) $(E2SM_FLAGS) $(X2FLAGS) $(XAPPFLAGS) $(PLUGININTERFACEFLAGS)
+$(PLUGINS_OBJ): export CPPFLAGS = $(BASEFLAGS) $(ASN1C_FLAGS) $(X2FLAGS) $(PLUGINFLAGS) $(PLUGININTERFACEFLAGS)
+$(XAPP_OBJ):export CPPFLAGS=$(BASEFLAGS)   $(SUBSCRFLAGS) $(PLUGINFLAGS) $(CURLFLAGS) $(E2AP_C_FLAGS) $(ASN1C_FLAGS) $(E2SM_FLAGS) $(X2FLAGS) $(XAPPFLAGS) $(PLUGININTERFACEFLAGS)
 
-OBJ= $(SUBSCR_OBJ) $(XAPP_OBJ) $(JSON_OBJ)  $(PLUGINS_OBJ) $(CURL_OBJ) $(E2AP_C_OBJ) $(ASN1C_MODULES) $(E2SM_OBJ) $(X2AP_OBJ) $(PLUGININTERFACE_OBJ)
+OBJ= $(SUBSCR_OBJ) $(XAPP_OBJ) $(PLUGINS_OBJ) $(CURL_OBJ) $(E2AP_C_OBJ) $(ASN1C_MODULES) $(E2SM_OBJ) $(X2AP_OBJ) $(PLUGININTERFACE_OBJ)
 
 adm-ctrl-xapp: $(OBJ)
 	$(CXX) -o $@  $(OBJ) $(LIBS) $(CPPFLAGS) $(CLOGFLAGS) 
@@ -81,4 +82,4 @@ install: adm-ctrl-xapp
 	install  -D adm-ctrl-xapp  /usr/local/bin/adm-ctrl-xapp
 
 clean:
-	-rm *.o $(JSON)/*.o $(E2AP_c)/*.o $(SUBSCR)/*.o $(PLUGIN)/*.o $(E2SM)/*.o $(X2AP)/*.o $(CURL)/*.o $(PLUGININTERFACE)/*.o adm-ctrl-xapp
+	-rm *.o  $(E2AP_c)/*.o $(SUBSCR)/*.o $(PLUGIN)/*.o $(E2SM)/*.o $(X2AP)/*.o $(CURL)/*.o $(PLUGININTERFACE)/*.o adm-ctrl-xapp