more directory re-arrange

Makefile.am

@@ -13,14 +13,14 @@ cellwired_LDADD = \
     $(top_srcdir)/src/libcellwire.la \
     $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/logger/liblogger.la \
-    $(top_srcdir)/lib/message/src/libmessage.la \
+    $(top_srcdir)/lib/message/s1ap/libmessages1ap.la \
     -lpthread -lm -lsctp @OSLIBS@
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
     -I$(top_srcdir)/lib/logger \
-    -I$(top_srcdir)/lib/message/src/s1ap \
-    -I$(top_srcdir)/lib/emssage/src \
+    -I$(top_srcdir)/lib/message/s1ap/asn1c \
+    -I$(top_srcdir)/lib/emssage/s1ap \
     -I$(top_srcdir)/src
 
 CLEANFILES = symtbl.c

configure.ac

@@ -250,8 +250,8 @@ esac
 AC_CONFIG_FILES([lib/core/test/Makefile])
 AC_CONFIG_FILES([lib/core/Makefile])
 AC_CONFIG_FILES([lib/logger/Makefile])
-AC_CONFIG_FILES([lib/message/src/s1ap/Makefile])
-AC_CONFIG_FILES([lib/message/src/Makefile])
+AC_CONFIG_FILES([lib/message/s1ap/asn1c/Makefile])
+AC_CONFIG_FILES([lib/message/s1ap/Makefile])
 AC_CONFIG_FILES([lib/message/Makefile])
 AC_CONFIG_FILES([lib/Makefile])
 AC_CONFIG_FILES([src/Makefile])

lib/message/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src
+SUBDIRS = s1ap
 
 MAINTAINERCLEANFILES = Makefile.in 
 MOSTLYCLEANFILES = *.stackdump

lib/message/s1ap/Makefile.am

@@ -1,26 +1,26 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = s1ap
+SUBDIRS = asn1c
 
-noinst_LTLIBRARIES = libmessage.la
+noinst_LTLIBRARIES = libmessages1ap.la
 
-libmessage_la_SOURCES = \
+libmessages1ap_la_SOURCES = \
 	s1ap_ies_defs.h s1ap_codecs.h
 
-nodist_libmessage_la_SOURCES = \
+nodist_libmessages1ap_la_SOURCES = \
 	s1ap_encoder.c s1ap_decoder.c s1ap_free.c \
 	s1ap_ies_encoder.c s1ap_ies_decoder.c s1ap_ies_free.c s1ap_ies_xer_print.c
 
-libmessage_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/message/src/s1ap/libmessages1ap.la
+libmessages1ap_la_DEPENDENCIES = \
+    $(top_srcdir)/lib/message/s1ap/asn1c/libmessages1apasn1c.la
 
-libmessage_la_LIBADD = \
-    $(top_srcdir)/lib/message/src/s1ap/libmessages1ap.la
+libmessages1ap_la_LIBADD = \
+    $(top_srcdir)/lib/message/s1ap/asn1c/libmessages1apasn1c.la
 
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/message/src/s1ap
+    -I$(top_srcdir)/lib/message/s1ap/asn1c
 
 AM_CFLAGS = \
 	-Wall -Werror

lib/message/s1ap/asn1c/Makefile.am

@@ -807,9 +807,9 @@ ASN_MODULE_SOURCES+=per_encoder.c
 ASN_MODULE_INCLUDES+=per_opentype.h
 ASN_MODULE_SOURCES+=per_opentype.c
 
-noinst_LTLIBRARIES=libmessages1ap.la
-libmessages1ap_la_SOURCES=$(ASN_MODULE_INCLUDES)
-nodist_libmessages1ap_la_SOURCES=$(ASN_MODULE_SOURCES)
+noinst_LTLIBRARIES=libmessages1apasn1c.la
+libmessages1apasn1c_la_SOURCES=$(ASN_MODULE_INCLUDES)
+nodist_libmessages1apasn1c_la_SOURCES=$(ASN_MODULE_SOURCES)
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include