acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

build update for moving lib/asn/asn1c to lib/asn/src/asn1c

This commit is contained in:
Sukchan Lee 2017-02-04 15:26:55 +09:00
parent 97d7b6f490
commit 9513e495b8
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -18,6 +18,8 @@ cellwired_LDADD = \
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/core/include \
-I$(top_srcdir)/lib/asn/asn1c \
-I$(top_srcdir)/lib/asn/src \
-I$(top_srcdir)/lib/logger \
-I$(top_srcdir)/src

4
configure.ac
View File

@ -244,7 +244,6 @@ AC_SUBST(OSLIBS)
#### Conclusion. ####
#####################
AC_CONFIG_FILES([lib/Makefile])
AC_CONFIG_FILES([lib/core/include/core.h])
AC_CONFIG_FILES([lib/core/src/Makefile])
case $host in
@ -255,10 +254,11 @@ esac
AC_CONFIG_FILES([lib/core/test/Makefile])
AC_CONFIG_FILES([lib/core/Makefile])
AC_CONFIG_FILES([lib/logger/Makefile])
AC_CONFIG_FILES([lib/asn/asn1c/Makefile])
AC_CONFIG_FILES([lib/asn/src/asn1c/Makefile])
AC_CONFIG_FILES([lib/asn/src/Makefile])
AC_CONFIG_FILES([lib/asn/test/Makefile])
AC_CONFIG_FILES([lib/asn/Makefile])
AC_CONFIG_FILES([lib/Makefile])
AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

2
lib/asn/Makefile.am
View File

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

4
lib/asn/README
View File

@ -17,7 +17,7 @@ user@host Documents/~/git/AuthenticEshkinKot$ \
autoreconf -iv;./configure;make
* ASN.1 encoder/decoder
user@host ~/Documents/git/cellwire/lib/asn/asn1c$ \
../../../../AuthenticEshkinKot/asn1c/asn1c \
user@host ~/Documents/git/cellwire/lib/asn/src/asn1c$ \
../../../../../AuthenticEshkinKot/asn1c/asn1c \
-fcompound-names -gen-PER ../support/S1AP-PDU.asn

8
lib/asn/src/Makefile.am
View File

@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = asn1c
noinst_LTLIBRARIES = libasn.la
libasn_la_SOURCES = \
@ -11,15 +13,15 @@ nodist_libasn_la_SOURCES = \
s1ap_mme_encoder.c s1ap_mme_decoder.c
libasn_la_DEPENDENCIES = \
$(top_srcdir)/lib/asn/asn1c/libasn1c.la
$(top_srcdir)/lib/asn/src/asn1c/libasn1c.la
libasn_la_LIBADD = \
$(top_srcdir)/lib/asn/asn1c/libasn1c.la
$(top_srcdir)/lib/asn/src/asn1c/libasn1c.la
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/core/include \
-I$(top_srcdir)/lib/asn/asn1c
-I$(top_srcdir)/lib/asn/src/asn1c
AM_CFLAGS = \
-Wall -Werror -Wno-incompatible-pointer-types

2
lib/asn/test/Makefile.am
View File

@ -14,7 +14,7 @@ testasn_LDADD = \
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/core/include \
-I$(top_srcdir)/lib/asn/asn1c \
-I$(top_srcdir)/lib/asn/src/asn1c \
-I$(top_srcdir)/lib/asn/src
AM_CFLAGS = \