Merge branch 'dep' of https://github.com/acetcom/nextepc into dep

fix the conflict

lib/fd/extensions/dbg_msg_dumps/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = dbg_msg_dumps.la
 dbg_msg_dumps_la_SOURCES = \
 	dbg_msg_dumps.c
 
+dbg_msg_dumps_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+dbg_msg_dumps_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_LDFLAGS = \
 	-module -avoid-version -shared
 

lib/fd/extensions/dict_dcca/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = dict_dcca.la
 dict_dcca_la_SOURCES = \
 	dict_dcca.c
 
+dict_dcca_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+dict_dcca_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_LDFLAGS = \
 	-module -avoid-version -shared
 

lib/fd/extensions/dict_dcca_3gpp/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = dict_dcca_3gpp.la
 dict_dcca_3gpp_la_SOURCES = \
 	dict_dcca_3gpp.c
 
+dict_dcca_3gpp_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+dict_dcca_3gpp_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_LDFLAGS = \
 	-module -avoid-version -shared
 

lib/fd/extensions/dict_legacy_xml/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = dict_legacy_xml.la
 dict_legacy_xml_la_SOURCES = \
 	dict_lxml.tab.y lex.dict_lxml.l dict_lxml.c dict_lxml_xml.c
 
+dict_legacy_xml_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+dict_legacy_xml_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_YFLAGS = -p dict_lxml -d
 
 AM_LFLAGS = -p -Cem -Pdict_lxml

lib/fd/extensions/dict_mip6i/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = dict_mip6i.la
 dict_mip6i_la_SOURCES = \
 	dict_mip6i.c
 
+dict_mip6i_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+dict_mip6i_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_LDFLAGS = \
 	-module -avoid-version -shared
 

lib/fd/extensions/dict_nas_mipv6/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = dict_nas_mipv6.la
 dict_nas_mipv6_la_SOURCES = \
 	dict_nas_mipv6.c
 
+dict_nas_mipv6_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+dict_nas_mipv6_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_LDFLAGS = \
 	-module -avoid-version -shared
 

lib/fd/extensions/dict_nasreq/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = dict_nasreq.la
 dict_nasreq_la_SOURCES = \
 	dict_nasreq.c
 
+dict_nasreq_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+dict_nasreq_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_LDFLAGS = \
 	-module -avoid-version -shared
 

lib/fd/extensions/dict_rfc5777/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = dict_rfc5777.la
 dict_rfc5777_la_SOURCES = \
 	dict_rfc5777.c
 
+dict_rfc5777_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+dict_rfc5777_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_LDFLAGS = \
 	-module -avoid-version -shared
 

lib/fd/extensions/dict_s6a/Makefile.am

@@ -5,6 +5,14 @@ pkglib_LTLIBRARIES = dict_s6a.la
 dict_s6a_la_SOURCES = \
 	dict_s6a.c
 
+dict_s6a_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
+dict_s6a_la_LIBADD = \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdcore/libfdcore.la \
+    $(top_srcdir)/lib/@FREEDIAMETER_DIR@/libfdproto/libfdproto.la
+
 AM_LDFLAGS = \
 	-module -avoid-version -shared