seperate libbase to the libapp

2017-11-07 14:01:27 +00:00 · 2017-11-07 14:01:27 +00:00 · 6e00fd349c
parent 3778e47bdc
commit 6e00fd349c
14 changed files with 109 additions and 77 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -26,7 +26,8 @@ nextepc_epcd_LDADD = $(top_srcdir)/src/libepc.la

 AM_CPPFLAGS = \
    -I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/src
+    -I$(top_srcdir)/src/app \
+	$(NULL)

 install-data-hook:
 	$(MKDIR_P) $(DESTDIR)/$(localstatedir)/log/nextepc
--- a/configure.ac
+++ b/configure.ac
@ -423,6 +423,7 @@ AC_CONFIG_FILES([lib/fd/Makefile])
 AC_CONFIG_FILES([lib/gtp/Makefile])
 AC_CONFIG_FILES([lib/ipfw/Makefile])
 AC_CONFIG_FILES([lib/Makefile])
+AC_CONFIG_FILES([src/app/Makefile])
 AC_CONFIG_FILES([src/mme/Makefile])
 AC_CONFIG_FILES([src/hss/Makefile])
 AC_CONFIG_FILES([src/sgw/Makefile])
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@ -3,27 +3,28 @@
 pkglib_LTLIBRARIES = libbase.la

 libbase_la_SOURCES = \
-	types.h context.h \
-	types.c context.c
+	types.h types.c \
+	$(NULL)

 libbase_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/core/src/libcore.la
+    $(top_srcdir)/lib/core/src/libcore.la \
+	$(NULL)

 libbase_la_LIBADD = \
    $(top_srcdir)/lib/core/src/libcore.la \
-	@MONGOC_LIBS@
+	$(NULL)

 AM_LDFLAGS = \
-	-version-info @LIBVERSION@
+	-version-info @LIBVERSION@ \
+	$(NULL)

 AM_CPPFLAGS = \
    -I$(top_srcdir)/lib/core/include \
-	@MONGOC_CFLAGS@
+	$(NULL)

 AM_CFLAGS = \
-	-Wall -Werror
-
-DEFS = @DEFS@ -DSYSCONF_DIR=\"$(sysconfdir)/\"
+	-Wall -Werror \
+	$(NULL)

 MAINTAINERCLEANFILES = Makefile.in 
 MOSTLYCLEANFILES = *.stackdump
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,66 +1,53 @@
 ## Process this file with automake to produce Makefile.in.

-SUBDIRS = mme hss sgw pgw pcrf
+SUBDIRS = app mme hss sgw pgw pcrf

 noinst_LTLIBRARIES = libmme.la libhss.la libsgw.la libpgw.la libpcrf.la libepc.la

-COMMON_SOURCES = init.c
-COMMON_INCLUDES = app.h
+libmme_la_SOURCES = mme.c
+libmme_la_DEPENDENCIES = $(top_srcdir)/src/mme/libmme.la 
+libmme_la_LIBADD = $(top_srcdir)/src/mme/libmme.la

-libmme_la_SOURCES = $(COMMON_INCLUDES) mme.c $(COMMON_SOURCES)
-libmme_la_DEPENDENCIES = \
-    $(top_srcdir)/src/mme/libmme.la
-libmme_la_LIBADD = \
-    $(top_srcdir)/src/mme/libmme.la
+libhss_la_SOURCES = hss.c
+libhss_la_DEPENDENCIES = $(top_srcdir)/src/hss/libhss.la
+libhss_la_LIBADD = $(top_srcdir)/src/hss/libhss.la

-libhss_la_SOURCES = $(COMMON_INCLUDES) hss.c $(COMMON_SOURCES)
-libhss_la_DEPENDENCIES = \
-    $(top_srcdir)/src/hss/libhss.la
-libhss_la_LIBADD = \
-    $(top_srcdir)/src/hss/libhss.la
+libsgw_la_SOURCES = sgw.c
+libsgw_la_DEPENDENCIES = $(top_srcdir)/src/sgw/libsgw.la
+libsgw_la_LIBADD = $(top_srcdir)/src/sgw/libsgw.la 

-libsgw_la_SOURCES = $(COMMON_INCLUDES) sgw.c $(COMMON_SOURCES)
-libsgw_la_DEPENDENCIES = \
-    $(top_srcdir)/src/sgw/libsgw.la
-libsgw_la_LIBADD = \
-    $(top_srcdir)/src/sgw/libsgw.la
+libpgw_la_SOURCES = pgw.c
+libpgw_la_DEPENDENCIES = $(top_srcdir)/src/pgw/libpgw.la
+libpgw_la_LIBADD = $(top_srcdir)/src/pgw/libpgw.la

-libpgw_la_SOURCES = $(COMMON_INCLUDES) pgw.c $(COMMON_SOURCES)
-libpgw_la_DEPENDENCIES = \
-    $(top_srcdir)/src/pgw/libpgw.la
-libpgw_la_LIBADD = \
-    $(top_srcdir)/src/pgw/libpgw.la
+libpcrf_la_SOURCES = pcrf.c
+libpcrf_la_DEPENDENCIES = $(top_srcdir)/src/pcrf/libpcrf.la 
+libpcrf_la_LIBADD = $(top_srcdir)/src/pcrf/libpcrf.la 

-libpcrf_la_SOURCES = $(COMMON_INCLUDES) pcrf.c $(COMMON_SOURCES)
-libpcrf_la_DEPENDENCIES = \
-    $(top_srcdir)/src/pcrf/libpcrf.la
-libpcrf_la_LIBADD = \
-    $(top_srcdir)/src/pcrf/libpcrf.la
-
-libepc_la_SOURCES = $(COMMON_INCLUDES) epc.c $(COMMON_SOURCES)
+libepc_la_SOURCES = epc.c
 libepc_la_DEPENDENCIES = \
    $(top_srcdir)/src/mme/libmme.la \
    $(top_srcdir)/src/hss/libhss.la \
    $(top_srcdir)/src/sgw/libsgw.la \
    $(top_srcdir)/src/pgw/libpgw.la \
-    $(top_srcdir)/src/pcrf/libpcrf.la
+    $(top_srcdir)/src/pcrf/libpcrf.la \
+	$(NULL)
 libepc_la_LIBADD = \
    $(top_srcdir)/src/mme/libmme.la \
    $(top_srcdir)/src/hss/libhss.la \
    $(top_srcdir)/src/sgw/libsgw.la \
    $(top_srcdir)/src/pgw/libpgw.la \
-    $(top_srcdir)/src/pcrf/libpcrf.la
+    $(top_srcdir)/src/pcrf/libpcrf.la \
+	$(NULL)

 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
-	-I$(top_srcdir)/lib/base
+	-I$(top_srcdir)/src/app \
+	$(NULL)

 AM_CFLAGS = \
-	-Wall -Werror
-
-DEFS = @DEFS@ \
-	   -DSYSCONF_DIR=\"$(sysconfdir)/\" \
-	   -DLOCALSTATE_DIR=\"$(localstatedir)/\"
+	-Wall -Werror \
+	$(NULL)

 MAINTAINERCLEANFILES = Makefile.in
 MOSTLYCLEANFILES = core *.stackdump
--- a/src/app/app.h
+++ b/src/app/app.h
--- a/lib/base/context.c
+++ b/lib/base/context.c
--- a/lib/base/context.h
+++ b/lib/base/context.h
--- a/src/app/init.c
+++ b/src/app/init.c
--- a/src/hss/Makefile.am
+++ b/src/hss/Makefile.am
@ -4,13 +4,18 @@ noinst_LTLIBRARIES = libhss.la

 libhss_la_SOURCES = \
 	milenage.h hss_kdf.h hss_context.h hss_fd_path.h \
-	milenage.c hss_kdf.c hss_init.c hss_context.c hss_fd_path.c
+	milenage.c hss_kdf.c hss_init.c hss_context.c hss_fd_path.c \
+	$(NULL)

 libhss_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/fd/libfd.la
+    $(top_srcdir)/lib/fd/libfd.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 libhss_la_LIBADD = \
-    $(top_srcdir)/lib/fd/libfd.la
+    $(top_srcdir)/lib/fd/libfd.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
@ -18,10 +23,13 @@ AM_CPPFLAGS = \
    -I$(top_srcdir)/lib/fd/s6a \
    -I$(top_srcdir)/lib/fd \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
-	@MONGOC_CFLAGS@
+	-I$(top_srcdir)/src/app \
+	@MONGOC_CFLAGS@ \
+	$(NULL)

 AM_CFLAGS = \
-	-Wall -Werror
+	-Wall -Werror \
+	$(NULL)

 MAINTAINERCLEANFILES = Makefile.in
 MOSTLYCLEANFILES = core *.stackdump
--- a/src/mme/Makefile.am
+++ b/src/mme/Makefile.am
@ -20,7 +20,8 @@ libmme_la_SOURCES = \
 	emm_sm.c emm_handler.c emm_build.c \
 	esm_sm.c esm_handler.c esm_build.c \
 	mme_gtp_path.c mme_s11_build.c mme_s11_handler.c \
-	mme_sm.c 
+	mme_sm.c \
+	$(NULL)

 if USRSCTP
 libmme_la_SOURCES += s1ap_usrsctp.c
@ -32,13 +33,17 @@ libmme_la_DEPENDENCIES = \
    $(top_srcdir)/lib/s1ap/libs1ap.la \
    $(top_srcdir)/lib/nas/libnas.la \
 	$(top_srcdir)/lib/fd/libfd.la \
-    $(top_srcdir)/lib/gtp/libgtp.la
+    $(top_srcdir)/lib/gtp/libgtp.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 libmme_la_LIBADD = \
    $(top_srcdir)/lib/s1ap/libs1ap.la \
    $(top_srcdir)/lib/nas/libnas.la \
    $(top_srcdir)/lib/fd/libfd.la \
-    $(top_srcdir)/lib/gtp/libgtp.la
+    $(top_srcdir)/lib/gtp/libgtp.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
@ -49,10 +54,13 @@ AM_CPPFLAGS = \
    -I$(top_srcdir)/lib/fd/s6a \
    -I$(top_srcdir)/lib/fd \
    -I$(top_srcdir)/lib/gtp \
-	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include
+	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
+	-I$(top_srcdir)/src/app \
+	$(NULL)

 AM_CFLAGS = \
-	-Wall -Werror
+	-Wall -Werror \
+	$(NULL)

 MAINTAINERCLEANFILES = Makefile.in
 MOSTLYCLEANFILES = core *.stackdump
--- a/src/pcrf/Makefile.am
+++ b/src/pcrf/Makefile.am
@ -4,13 +4,18 @@ noinst_LTLIBRARIES = libpcrf.la

 libpcrf_la_SOURCES = \
 	pcrf_context.h pcrf_fd_path.h \
-	pcrf_init.c pcrf_context.c pcrf_fd_path.c
+	pcrf_init.c pcrf_context.c pcrf_fd_path.c \
+	$(NULL)

 libpcrf_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/fd/libfd.la
+    $(top_srcdir)/lib/fd/libfd.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 libpcrf_la_LIBADD = \
-    $(top_srcdir)/lib/fd/libfd.la
+    $(top_srcdir)/lib/fd/libfd.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
@ -18,7 +23,9 @@ AM_CPPFLAGS = \
    -I$(top_srcdir)/lib/fd/gx \
    -I$(top_srcdir)/lib/fd \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
-	@MONGOC_CFLAGS@
+	-I$(top_srcdir)/src/app \
+	@MONGOC_CFLAGS@ \
+	$(NULL)

 AM_CFLAGS = \
 	-Wall -Werror
--- a/src/pgw/Makefile.am
+++ b/src/pgw/Makefile.am
@ -10,17 +10,22 @@ libpgw_la_SOURCES = \
 	pgw_ipfw.c \
    pgw_init.c pgw_event.c pgw_context.c pgw_sm.c \
 	pgw_gtp_path.c pgw_s5c_build.c pgw_s5c_handler.c \
-	pgw_fd_path.c pgw_gx_handler.c
+	pgw_fd_path.c pgw_gx_handler.c \
+	$(NULL)

 libpgw_la_DEPENDENCIES = \
    $(top_srcdir)/lib/fd/libfd.la \
    $(top_srcdir)/lib/gtp/libgtp.la \
-    $(top_srcdir)/lib/ipfw/libipfw.la
+    $(top_srcdir)/lib/ipfw/libipfw.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 libpgw_la_LIBADD = \
    $(top_srcdir)/lib/fd/libfd.la \
    $(top_srcdir)/lib/gtp/libgtp.la \
-    $(top_srcdir)/lib/ipfw/libipfw.la
+    $(top_srcdir)/lib/ipfw/libipfw.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
@ -29,10 +34,13 @@ AM_CPPFLAGS = \
    -I$(top_srcdir)/lib/fd \
    -I$(top_srcdir)/lib/gtp \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
-    -I$(top_srcdir)/lib/ipfw
+    -I$(top_srcdir)/lib/ipfw \
+	-I$(top_srcdir)/src/app \
+	$(NULL)

 AM_CFLAGS = \
-	-Wall -Werror
+	-Wall -Werror \
+	$(NULL)

 MAINTAINERCLEANFILES = Makefile.in
 MOSTLYCLEANFILES = core *.stackdump
--- a/src/sgw/Makefile.am
+++ b/src/sgw/Makefile.am
@ -6,18 +6,25 @@ libsgw_la_SOURCES = \
    sgw_event.h sgw_context.h \
 	sgw_gtp_path.h sgw_sm.h sgw_s11_handler.h sgw_s5c_handler.h \
    sgw_init.c sgw_event.c sgw_context.c \
-	sgw_gtp_path.c sgw_sm.c sgw_s11_handler.c sgw_s5c_handler.c
+	sgw_gtp_path.c sgw_sm.c sgw_s11_handler.c sgw_s5c_handler.c \
+	$(NULL)

 libsgw_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/gtp/libgtp.la
+    $(top_srcdir)/lib/gtp/libgtp.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 libsgw_la_LIBADD = \
-    $(top_srcdir)/lib/gtp/libgtp.la
+    $(top_srcdir)/lib/gtp/libgtp.la \
+    $(top_srcdir)/src/app/libapp.la \
+	$(NULL)

 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
    -I$(top_srcdir)/lib/base \
-    -I$(top_srcdir)/lib/gtp
+    -I$(top_srcdir)/lib/gtp \
+	-I$(top_srcdir)/src/app \
+	$(NULL)

 AM_CFLAGS = \
 	-Wall -Werror
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -6,7 +6,8 @@ testepc_SOURCES = \
 	abts.h abts_tests.h testutil.h \
 	abts.c testutil.c testpacket.h testpacket.c \
 	base_test.c s1ap_message_test.c nas_message_test.c gtp_message_test.c \
-	security_test.c s1setup_test.c attach_test.c volte_test.c handover_test.c
+	security_test.c s1setup_test.c attach_test.c volte_test.c handover_test.c \
+	$(NULL)

 if USRSCTP
 testepc_SOURCES += testusrsctp.c
@ -15,7 +16,8 @@ testepc_SOURCES += testsctp.c
 endif

 testepc_LDADD = \
-    $(top_srcdir)/src/libepc.la
+    $(top_srcdir)/src/libepc.la \
+	$(NULL)

 AM_CPPFLAGS = \
    -I$(top_srcdir)/lib/core/include \
@ -23,19 +25,21 @@ AM_CPPFLAGS = \
    -I$(top_srcdir)/lib/s1ap/asn1c \
    -I$(top_srcdir)/lib/s1ap \
    -I$(top_srcdir)/lib/nas \
+	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
    -I$(top_srcdir)/lib/fd/s6a \
    -I$(top_srcdir)/lib/fd \
    -I$(top_srcdir)/lib/gtp \
    -I$(top_srcdir)/src/mme \
    -I$(top_srcdir)/src/hss \
    -I$(top_srcdir)/src/sgw \
-    -I$(top_srcdir)/src \
-	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include \
-	@MONGOC_CFLAGS@
+	-I$(top_srcdir)/src/app \
+	@MONGOC_CFLAGS@ \
+	$(NULL)

 AM_CFLAGS = \
 	-Wall -Werror \
-	-Wno-unused-function -Wno-unused-variable
+	-Wno-unused-function -Wno-unused-variable \
+	$(NULL)

 MAINTAINERCLEANFILES = Makefile.in 
 MOSTLYCLEANFILES = core *.stackdump