change shared library

Makefile.am

@@ -8,27 +8,21 @@ bin_PROGRAMS = nextepc-mmed nextepc-hssd nextepc-sgwd nextepc-pgwd nextepc-pcrfd
 
 dist_nextepc_mmed_SOURCES = main.c
 nextepc_mmed_LDADD = $(top_srcdir)/src/libmme.la
-nextepc_mmed_LDFLAGS = -export-dynamic
 
 dist_nextepc_hssd_SOURCES = main.c
 nextepc_hssd_LDADD = $(top_srcdir)/src/libhss.la
-nextepc_hssd_LDFLAGS = -export-dynamic
 
 dist_nextepc_sgwd_SOURCES = main.c
 nextepc_sgwd_LDADD = $(top_srcdir)/src/libsgw.la
-nextepc_sgwd_LDFLAGS = -export-dynamic
 
 dist_nextepc_pgwd_SOURCES = main.c
 nextepc_pgwd_LDADD = $(top_srcdir)/src/libpgw.la
-nextepc_pgwd_LDFLAGS = -export-dynamic
 
 dist_nextepc_pcrfd_SOURCES = main.c
 nextepc_pcrfd_LDADD = $(top_srcdir)/src/libpcrf.la
-nextepc_pcrfd_LDFLAGS = -export-dynamic
 
 dist_nextepc_epcd_SOURCES = main.c
 nextepc_epcd_LDADD = $(top_srcdir)/src/libepc.la
-nextepc_epcd_LDFLAGS = -export-dynamic
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \

configure.ac

@@ -381,11 +381,11 @@ AC_CHECK_FUNCS(\
     sched_yield \
 )
 
-AC_SUBST(CORE_LIBS)
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(gethostname, nsl)
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(pthread_barrier_wait, pthread)
+AC_SEARCH_LIBS(gnutls_global_set_log_level, gnutls)
 
 AC_SEARCH_LIBS([sctp_sendmsg], [sctp], [have_sctp_lib=yes], [have_sctp_lib=no])
 if test x$have_sctp_lib == xno; then
@@ -397,8 +397,6 @@ if test x$have_sctp_lib == xno; then
   fi 
 fi
 AM_CONDITIONAL([USRSCTP], [test x$have_usrsctp_lib = xyes])
-CORE_LIBS="$LIBS"
-LIBS=""
 
 PKG_CHECK_MODULES([MONGOC], libmongoc-1.0 >= 1.3.1)
 FREEDIAMETER_DIR=freeDiameter-1.2.1
@@ -475,7 +473,7 @@ host                    : ${host}
 source code location    : ${srcdir}
 compiler                : ${CC}
 compiler flags          : ${CFLAGS}
-linker flags            : ${LDFLAGS} ${CORE_LIBS} ${MONGOC_LIBS}
+linker flags            : ${LDFLAGS} ${LIBS} ${MONGOC_LIBS}
 bin directory           : ${BIN_DIR}
 lib directory           : ${LIB_DIR}/nextepc
 config directory        : ${SYSCONF_DIR}/nextepc

lib/base/Makefile.am

@@ -6,7 +6,15 @@ libbase_la_SOURCES = \
 	types.h context.h \
 	types.c context.c
 
-libbase_la_LIBADD = @MONGOC_LIBS@
+libbase_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
+    $(top_srcdir)/lib/core/src/libcore.la \
+	@MONGOC_LIBS@
+
+libbase_la_LIBADD = \
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
+    $(top_srcdir)/lib/core/src/libcore.la \
+	@MONGOC_LIBS@
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \

lib/core/src/Makefile.am

@@ -19,16 +19,15 @@ libcore_la_SOURCES = \
 	../include/core_atomic.h ../include/core_portable.h \
 	../include/core_version.h ../include/core_event.h ../include/core_hash.h \
 	../include/core_jsmn.h \
-	version.c debug.c fsm.c msgq.c ringbuf.c timer.c tlv.c tlv_msg.c \
+	version.c fsm.c msgq.c ringbuf.c timer.c tlv.c tlv_msg.c \
 	aes.c aes_cmac.c sha1.c sha1_hmac.c sha2.c sha2_hmac.c misc.c event.c \
-	hash.c jsmn.c
+	hash.c jsmn.c start.c
 
 libcore_la_DEPENDENCIES = \
     $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la
 
 libcore_la_LIBADD = \
-    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
-	@CORE_LIBS@
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include/arch/@OSDIR@ \

lib/core/src/unix/Makefile.am

@@ -8,8 +8,8 @@ libcoreunix_la_SOURCES = \
     ../../include/arch/unix/core_arch_mutex.h \
     ../../include/arch/unix/core_arch_semaphore.h \
     ../../include/arch/unix/core_arch_thread.h \
-    cond.c file.c net_lib.c thread.c errorcodes.c mutex.c rwlock.c \
-    start.c time.c semaphore.c signal.c pkbuf.c rand.c atomic.c
+    debug.c cond.c file.c net_lib.c thread.c errorcodes.c mutex.c rwlock.c \
+    time.c semaphore.c signal.c pkbuf.c rand.c atomic.c
 
 AM_CPPFLAGS = \
     -I$(top_srcdir) \

lib/core/test/Makefile.am

@@ -14,10 +14,10 @@ testcore_SOURCES += testsctp.c
 endif
 
 testcore_LDADD = \
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
     $(top_srcdir)/lib/core/src/libcore.la
 
 AM_CPPFLAGS = \
-    -I$(top_srcdir)/lib/core/include/arch/@OSDIR@ \
     -I$(top_srcdir)/lib/core/include
 
 AM_CFLAGS = \

lib/fd/Makefile.am

@@ -9,10 +9,14 @@ libfd_la_SOURCES = \
 	libapp_sip.c fd_message.c fd_logger.c fd_init.c
 
 libfd_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
+    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
     $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
 
 libfd_la_LIBADD = \
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
+    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
     $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
 

lib/fd/gx/Makefile.am

@@ -5,9 +5,23 @@ pkglib_LTLIBRARIES = libfdgx.la
 libfdgx_la_SOURCES = \
 	gx_dict.h gx_message.h dict_init.c gx_message.c
 
+libfdgx_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
+    $(top_srcdir)/lib/core/src/libcore.la \
+    $(top_srcdir)/lib/base/libbase.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+libfdgx_la_LIBADD = \
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
+    $(top_srcdir)/lib/core/src/libcore.la \
+    $(top_srcdir)/lib/base/libbase.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/base \
+	-I$(top_srcdir)/lib/base \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include
 
 AM_CFLAGS = \

lib/fd/s6a/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = libfds6a.la
 libfds6a_la_SOURCES = \
 	s6a_dict.h s6a_message.h dict_init.c
 
+libfds6a_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+libfds6a_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/@FREEDIAMETER_DIR@/include
 

lib/freeDiameter-1.2.1/Makefile.am

@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libfdcore libfdproto
+SUBDIRS = libfdproto libfdcore
 
 MAINTAINERCLEANFILES = \
     configure include/freeDiameter/config.h.in \

lib/freeDiameter-1.2.1/configure.ac

@@ -8,7 +8,7 @@ dnl This program is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT([freeDiameter], [1.2.1], [acetcom@gmail.com])
+AC_INIT([nextepc], [1.2.1], [acetcom@gmail.com])
 
 dnl Must come before AM_INIT_AUTOMAKE.
 AC_CONFIG_AUX_DIR([build-aux])

lib/freeDiameter-1.2.1/libfdcore/Makefile.am

@@ -10,7 +10,11 @@ libfdcore_la_SOURCES = \
 	p_out.c p_psm.c p_sr.c routing_dispatch.c server.c tcp.c \
 	fdd.tab.y lex.fdd.l version.c
 
-libfdcore_la_LIBADD = $(LIBS)
+libfdcore_la_DEPENDENCIES = \
+	$(top_srcdir)/libfdproto/libfdproto.la
+
+libfdcore_la_LIBADD = \
+	$(top_srcdir)/libfdproto/libfdproto.la
 
 if SCTP
 libfdcore_la_SOURCES += sctp.c sctp3436.c

lib/gtp/Makefile.am

@@ -7,9 +7,13 @@ libgtp_la_SOURCES = \
 	gtp_message.c gtp_types.c gtp_conv.c gtp_path.c gtp_xact.c
 
 libgtp_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
+    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/base/libbase.la
 
 libgtp_la_LIBADD = \
+    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la \
+    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/base/libbase.la
 
 AM_CPPFLAGS = \

lib/ipfw/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-pkglib_LTLIBRARIES = libipfw.la
+noinst_LTLIBRARIES = libipfw.la
 
 libipfw_la_SOURCES = \
 	ipfw2.h \
@@ -8,6 +8,9 @@ libipfw_la_SOURCES = \
 	expand_number.c humanize_number.c \
 	glue.c
 
+AM_LDFLAGS = \
+	-avoid-version -shared
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/ipfw/objs/include_e \
 	-include glue.h \

lib/logger/Makefile.am

@@ -5,6 +5,9 @@ pkglib_LTLIBRARIES = liblogger.la
 liblogger_la_SOURCES = \
 	logger.h logger.c
 
+AM_LDFLAGS = \
+	-avoid-version -shared
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/core/include
 

lib/nas/Makefile.am

@@ -1,15 +1,17 @@
 ## Process this file with automake to produce Makefile.in
 
-pkglib_LTLIBRARIES = libnas.la
+noinst_LTLIBRARIES = libnas.la
 
 libnas_la_SOURCES = \
 	nas_message.h nas_ies.h nas_types.h \
 	nas_decoder.c nas_encoder.c nas_ies.c nas_types.c
 
 libnas_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/base/libbase.la
 
 libnas_la_LIBADD = \
+    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/base/libbase.la
 
 AM_CPPFLAGS = \

lib/s1ap/Makefile.am

@@ -2,7 +2,7 @@
 
 SUBDIRS = asn1c
 
-pkglib_LTLIBRARIES = libs1ap.la
+noinst_LTLIBRARIES = libs1ap.la
 
 libs1ap_la_SOURCES = \
 	s1ap_asn1c.h s1ap_ies_defs.h s1ap_message.h \
@@ -10,10 +10,12 @@ libs1ap_la_SOURCES = \
 	s1ap_ies_encoder.c s1ap_ies_decoder.c s1ap_ies_free.c s1ap_ies_xer_print.c
 
 libs1ap_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/base/libbase.la \
     $(top_srcdir)/lib/s1ap/asn1c/libs1apasn1c.la
 
 libs1ap_la_LIBADD = \
+    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/base/libbase.la \
     $(top_srcdir)/lib/s1ap/asn1c/libs1apasn1c.la
 

lib/s1ap/asn1c/Makefile.am

@@ -802,9 +802,15 @@ ASN_MODULE_SOURCES+=per_encoder.c
 ASN_MODULE_INCLUDES+=per_opentype.h
 ASN_MODULE_SOURCES+=per_opentype.c
 
-pkglib_LTLIBRARIES=libs1apasn1c.la
+noinst_LTLIBRARIES=libs1apasn1c.la
 libs1apasn1c_la_SOURCES=$(ASN_MODULE_INCLUDES) $(ASN_MODULE_SOURCES)
 
+libs1apasn1c_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/core/src/libcore.la
+
+libs1apasn1c_la_LIBADD = \
+    $(top_srcdir)/lib/core/src/libcore.la
+
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include
 

src/Makefile.am

@@ -17,10 +17,8 @@ libmme_la_LIBADD = \
 
 libhss_la_SOURCES = $(COMMON_INCLUDES) hss.c $(COMMON_SOURCES)
 libhss_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/base/libbase.la \
     $(top_srcdir)/src/hss/libhss.la
 libhss_la_LIBADD = \
-    $(top_srcdir)/lib/base/libbase.la \
     $(top_srcdir)/src/hss/libhss.la
 
 libsgw_la_SOURCES = $(COMMON_INCLUDES) sgw.c $(COMMON_SOURCES)

src/hss/Makefile.am

@@ -7,12 +7,12 @@ libhss_la_SOURCES = \
 	milenage.c hss_kdf.c hss_init.c hss_context.c hss_fd_path.c
 
 libhss_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/core/src/libcore.la \
+    $(top_srcdir)/lib/base/libbase.la \
 	$(top_srcdir)/lib/fd/s6a/libfds6a.la \
     $(top_srcdir)/lib/fd/libfd.la
 
 libhss_la_LIBADD = \
-    $(top_srcdir)/lib/core/src/libcore.la \
+    $(top_srcdir)/lib/base/libbase.la \
 	$(top_srcdir)/lib/fd/s6a/libfds6a.la \
     $(top_srcdir)/lib/fd/libfd.la
 

src/mme/Makefile.am

@@ -29,7 +29,6 @@ libmme_la_SOURCES += s1ap_sctp.c
 endif
 
 libmme_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/s1ap/libs1ap.la \
     $(top_srcdir)/lib/nas/libnas.la \
 	$(top_srcdir)/lib/fd/s6a/libfds6a.la \
@@ -37,7 +36,6 @@ libmme_la_DEPENDENCIES = \
     $(top_srcdir)/lib/gtp/libgtp.la
 
 libmme_la_LIBADD = \
-    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/s1ap/libs1ap.la \
     $(top_srcdir)/lib/nas/libnas.la \
 	$(top_srcdir)/lib/fd/s6a/libfds6a.la \

src/pcrf/Makefile.am

@@ -7,12 +7,10 @@ libpcrf_la_SOURCES = \
 	pcrf_init.c pcrf_context.c pcrf_fd_path.c
 
 libpcrf_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/core/src/libcore.la \
 	$(top_srcdir)/lib/fd/gx/libfdgx.la \
     $(top_srcdir)/lib/fd/libfd.la
 
 libpcrf_la_LIBADD = \
-    $(top_srcdir)/lib/core/src/libcore.la \
 	$(top_srcdir)/lib/fd/gx/libfdgx.la \
     $(top_srcdir)/lib/fd/libfd.la
 

src/pgw/Makefile.am

@@ -13,14 +13,12 @@ libpgw_la_SOURCES = \
 	pgw_fd_path.c pgw_gx_handler.c
 
 libpgw_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/core/src/libcore.la \
 	$(top_srcdir)/lib/fd/gx/libfdgx.la \
     $(top_srcdir)/lib/fd/libfd.la \
     $(top_srcdir)/lib/gtp/libgtp.la \
     $(top_srcdir)/lib/ipfw/libipfw.la
 
 libpgw_la_LIBADD = \
-    $(top_srcdir)/lib/core/src/libcore.la \
 	$(top_srcdir)/lib/fd/gx/libfdgx.la \
     $(top_srcdir)/lib/fd/libfd.la \
     $(top_srcdir)/lib/gtp/libgtp.la \

src/sgw/Makefile.am

@@ -9,11 +9,9 @@ libsgw_la_SOURCES = \
 	sgw_gtp_path.c sgw_sm.c sgw_s11_handler.c sgw_s5c_handler.c
 
 libsgw_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/gtp/libgtp.la
 
 libsgw_la_LIBADD = \
-    $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/gtp/libgtp.la
 
 AM_CPPFLAGS = \

test/Makefile.am

@@ -37,9 +37,5 @@ AM_CFLAGS = \
 	-Wall -Werror \
 	-Wno-unused-function -Wno-unused-variable
 
-AM_LDFLAGS = -export-dynamic
-
-TESTS = checkepc.sh
-
 MAINTAINERCLEANFILES = Makefile.in 
 MOSTLYCLEANFILES = core *.stackdump