update it

Makefile.am

@@ -10,12 +10,12 @@ dist_cellwired_SOURCES = main.c symtbl.h
 nodist_cellwired_SOURCES = symtbl.c
 
 cellwired_LDADD = \
-    $(top_srcdir)/src/libcellwire.la
+    $(top_srcdir)/src/mme/libmme.la
 
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/src
+    -I$(top_srcdir)/src/mme
 
 CLEANFILES = symtbl.c
 DISTCLEANFILES = $(DIST_ARCHIVES)

configure.ac

@@ -264,6 +264,7 @@ AC_CONFIG_FILES([lib/nas/Makefile])
 AC_CONFIG_FILES([lib/s6a/freeDiameter/Makefile])
 AC_CONFIG_FILES([lib/s6a/Makefile])
 AC_CONFIG_FILES([lib/Makefile])
+AC_CONFIG_FILES([src/mme/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([Makefile])

src/Makefile.am

@@ -1,52 +1,6 @@
-## Process this file with automake to produce Makefile.in.
+## Process this file with automake to produce Makefile.in
 
-noinst_LTLIBRARIES = libcellwire.la
+SUBDIRS = mme
 
-libcellwire_la_SOURCES = \
-    cellwire.h event.h context.h \
-	s1ap_build.h s1ap_conv.h s1ap_path.h \
-	s6_auth_info.h \
-	sm.h 
-
-
-nodist_libcellwire_la_SOURCES = \
-    init.c event.c context.c \
-	s1ap_build.c s1ap_conv.c s1ap_path.c \
-	s6a_auth_info.c \
-	mme_sm.c enb_s1_sm.c
-
-libcellwire_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/core/src/libcore.la \
-    $(top_srcdir)/lib/logger/liblogger.la \
-    $(top_srcdir)/lib/3gpp/lib3gpp.la \
-    $(top_srcdir)/lib/s1ap/libs1ap.la \
-    $(top_srcdir)/lib/nas/libnas.la \
-    $(top_srcdir)/lib/s6a/libs6a.la
-
-libcellwire_la_LIBADD = \
-    $(top_srcdir)/lib/core/src/libcore.la \
-    $(top_srcdir)/lib/logger/liblogger.la \
-    $(top_srcdir)/lib/3gpp/lib3gpp.la \
-    $(top_srcdir)/lib/s1ap/libs1ap.la \
-    $(top_srcdir)/lib/nas/libnas.la \
-    $(top_srcdir)/lib/s6a/libs6a.la
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/lib/core/include \
-	-I$(top_srcdir)/lib/logger \
-    -I$(top_srcdir)/lib/3gpp \
-    -I$(top_srcdir)/lib/s1ap/asn1c \
-    -I$(top_srcdir)/lib/s1ap \
-    -I$(top_srcdir)/lib/nas \
-    -I$(top_srcdir)/lib/s6a
-
-AM_CFLAGS = \
-	-Wall -Werror
-
-DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
-
-MAINTAINERCLEANFILES = Makefile.in
-MOSTLYCLEANFILES = core *.stackdump
-
-EXTRA_DIST = .libs $(noinst_LTLIBRARIES)
+MAINTAINERCLEANFILES = Makefile.in 
+MOSTLYCLEANFILES = *.stackdump

src/mme/Makefile.am

@@ -0,0 +1,52 @@
+## Process this file with automake to produce Makefile.in.
+
+noinst_LTLIBRARIES = libmme.la
+
+libmme_la_SOURCES = \
+    cellwire.h event.h context.h \
+	s1ap_build.h s1ap_conv.h s1ap_path.h \
+	s6_auth_info.h \
+	sm.h 
+
+
+nodist_libmme_la_SOURCES = \
+    init.c event.c context.c \
+	s1ap_build.c s1ap_conv.c s1ap_path.c \
+	s6a_auth_info.c \
+	mme_sm.c enb_s1_sm.c
+
+libmme_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/core/src/libcore.la \
+    $(top_srcdir)/lib/logger/liblogger.la \
+    $(top_srcdir)/lib/3gpp/lib3gpp.la \
+    $(top_srcdir)/lib/s1ap/libs1ap.la \
+    $(top_srcdir)/lib/nas/libnas.la \
+    $(top_srcdir)/lib/s6a/libs6a.la
+
+libmme_la_LIBADD = \
+    $(top_srcdir)/lib/core/src/libcore.la \
+    $(top_srcdir)/lib/logger/liblogger.la \
+    $(top_srcdir)/lib/3gpp/lib3gpp.la \
+    $(top_srcdir)/lib/s1ap/libs1ap.la \
+    $(top_srcdir)/lib/nas/libnas.la \
+    $(top_srcdir)/lib/s6a/libs6a.la
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/lib/core/include \
+	-I$(top_srcdir)/lib/logger \
+    -I$(top_srcdir)/lib/3gpp \
+    -I$(top_srcdir)/lib/s1ap/asn1c \
+    -I$(top_srcdir)/lib/s1ap \
+    -I$(top_srcdir)/lib/nas \
+    -I$(top_srcdir)/lib/s6a
+
+AM_CFLAGS = \
+	-Wall -Werror
+
+DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
+
+MAINTAINERCLEANFILES = Makefile.in
+MOSTLYCLEANFILES = core *.stackdump
+
+EXTRA_DIST = .libs $(noinst_LTLIBRARIES)

test/Makefile.am

@@ -11,7 +11,7 @@ testcellwire_SOURCES = \
 	security_test.c
 
 testcellwire_LDADD = \
-    $(top_srcdir)/src/libcellwire.la
+    $(top_srcdir)/src/mme/libmme.la
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
@@ -20,7 +20,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/s1ap \
     -I$(top_srcdir)/lib/nas \
     -I$(top_srcdir)/lib/s6a \
-    -I$(top_srcdir)/src
+    -I$(top_srcdir)/src/mme
 
 AM_CFLAGS = \
 	-Wall -Werror \