From 48c60f97714581e53de068b4a1b7c0d70bd41fdf Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 31 Mar 2023 05:09:53 +0700 Subject: [PATCH] fixup (partial revert): "coding: clean up Makefile.am" This is a partial revert of "9dca9027 coding: clean up Makefile.am". Even though libosmocoding does not use talloc API, it still depends on this library indirectly via libosmo{core,codec,gsm}. Furthermore, some of libosmocore's header files do #include , and thus #include via this internal header. Under Slackware 14.2 talloc.h header lives in /usr/include/samba-4.0, and without $(TALLOC_CFLAGS) compilation of libmsocoding fails due to the preprocessor failing to find this header. The culprit is my recent patch 9dca9027 removing $(TALLOC_CFLAGS) and $(TALLOC_LIBS). Put $(TALLOC_CFLAGS) back to AM_CFLAGS; it will likely be emply under distributions having talloc.h header in the standard include dir. The $(TALLOC_LIBS) does not need to be resurrected because libtool will add '-ltalloc' automatically for each libosmo*.la in LIBADD. Change-Id: Ic1bd82159a827af21fe36bea998f8f58f732473a Related: OS#5960 --- src/coding/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index bb7bde2cc..987e07353 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I"$(top_builddir)/include" \ -I"$(top_builddir)" \ $(NULL) -AM_CFLAGS = -Wall +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc