fixeria has uploaded this change for review.

View Change

coding: clean up Makefile.am

* Remove talloc related stuff, it's not used directly
* Remoave $(TALLOC_LIBS) from LDFLAGS - this is wrong
* Add missing LIBOSMO{CORE,GSM,CODEC}_CFLAGS

Change-Id: I18f0a65a47c37989f03928f99c4687bf8007d437
---
M src/coding/Makefile.am
1 file changed, 20 insertions(+), 8 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/80/31780/1

diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am
index 905d684..7163093 100644
--- a/src/coding/Makefile.am
+++ b/src/coding/Makefile.am
@@ -8,11 +8,11 @@
 	-I"$(top_builddir)/include" \
 	-I"$(top_builddir)" \
 	$(NULL)
-AM_CFLAGS = -Wall $(TALLOC_CFLAGS)
-
-if ENABLE_PSEUDOTALLOC
-AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc
-endif
+AM_CFLAGS = -Wall \
+	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOCODEC_CFLAGS) \
+	$(NULL)
 
 lib_LTLIBRARIES = libosmocoding.la
 
@@ -25,10 +25,9 @@
 	gsm0503_amr_dtx.c
 libosmocoding_la_LDFLAGS = \
 	$(LTLDFLAGS_OSMOCODING) \
-	-version-info \
-	$(LIBVERSION) \
+	-version-info $(LIBVERSION) \
 	-no-undefined \
-	$(TALLOC_LIBS)
+	$(NULL)
 
 libosmocoding_la_LIBADD = \
 	$(top_builddir)/src/core/libosmocore.la \

To view, visit change 31780. To unsubscribe, or for help writing mail filters, visit settings.