misc: Replace libosmocore with talloc

The libosmocore depedency is used for talloc and OSMO_ASSERT.
Reduce the depedencies by using libtalloc directly and replace
the ASSERT with a local one (without backtrace support).

 Conflicts:
	src/Makefile.am
	src/asn1helpers.c
This commit is contained in:
Holger Hans Peter Freyther 2016-04-05 16:25:43 +02:00
parent f6b9173b02
commit 60bd9cc097
4 changed files with 6 additions and 6 deletions

View File

@ -15,7 +15,7 @@ AC_PROG_LIBTOOL
AC_CONFIG_MACRO_DIR([m4])
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.1.13)
PKG_CHECK_MODULES(LIBTALLOC, talloc)
# The following test is taken from WebKit's webkit.m4
saved_CFLAGS="$CFLAGS"

View File

@ -15,7 +15,7 @@
#include <assert.h> /* for assert() macro */
#endif
#include <osmocom/core/talloc.h>
#include <talloc.h>
#ifdef __cplusplus
extern "C" {

View File

@ -6,6 +6,6 @@ includedir=@includedir@
Name: asn1c runtime library
Description: C Utility Library
Version: @VERSION@
Libs: -L${libdir} -lasn1c -lm
Cflags: -I${includedir}/ -I${includedir}/asn1c
Libs: -L${libdir} @LIBTALLOC_LIBS@ -lasn1c -lm
Cflags: -I${includedir}/ -I${includedir}/asn1c @LIBTALLOC_CFLAGS@

View File

@ -4,10 +4,10 @@
LIBVERSION=0:0:0
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include/asn1c
AM_CFLAGS = -fPIC -Wall $(LIBOSMOCORE_CFLAGS)
AM_CFLAGS = -fPIC -Wall $(LIBTALLOC_CFLAGS)
lib_LTLIBRARIES = libasn1c.la
libasn1c_la_LDFLAGS = $(LIBOSMOCORE_LIBS)
libasn1c_la_LDFLAGS = $(LIBTALLOC_LIBS)
libasn1c_la_SOURCES = ANY.c constraints.c GeneralizedTime.c NumericString.c T61String.c asn_codecs_prim.c constr_CHOICE.c GeneralString.c ObjectDescriptor.c TeletexString.c asn_SEQUENCE_OF.c constr_SEQUENCE.c GraphicString.c OBJECT_IDENTIFIER.c UniversalString.c asn_SET_OF.c constr_SEQUENCE_OF.c IA5String.c OCTET_STRING.c UTCTime.c ber_decoder.c constr_SET.c INTEGER.c per_decoder.c UTF8String.c ber_tlv_length.c constr_SET_OF.c ISO646String.c per_encoder.c VideotexString.c ber_tlv_tag.c constr_TYPE.c NativeEnumerated.c per_support.c VisibleString.c BIT_STRING.c NativeInteger.c PrintableString.c xer_decoder.c BMPString.c der_encoder.c NativeReal.c REAL.c xer_encoder.c BOOLEAN.c ENUMERATED.c NULL.c RELATIVE-OID.c xer_support.c per_opentype.c