File x.patch of Package osmo-cc-pstn-endpoint

diff --git a/src/libdtmf/Makefile.am b/src/libdtmf/Makefile.am
index f1df569..4152751 100644
--- a/src/libdtmf/Makefile.am
+++ b/src/libdtmf/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = libdtmf.a
 
diff --git a/src/libfsk/Makefile.am b/src/libfsk/Makefile.am
index 53f5563..e33af72 100644
--- a/src/libfsk/Makefile.am
+++ b/src/libfsk/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = libfsk.a
 
diff --git a/src/libjitter/Makefile.am b/src/libjitter/Makefile.am
index 506ef87..ba80638 100644
--- a/src/libjitter/Makefile.am
+++ b/src/libjitter/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = libjitter.a
 
diff --git a/src/liblogging/Makefile.am b/src/liblogging/Makefile.am
index a1b1e18..6ebef26 100644
--- a/src/liblogging/Makefile.am
+++ b/src/liblogging/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = liblogging.a
 
diff --git a/src/liboptions/Makefile.am b/src/liboptions/Makefile.am
index 0d10fa7..efead80 100644
--- a/src/liboptions/Makefile.am
+++ b/src/liboptions/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = liboptions.a
 
diff --git a/src/libph_socket/Makefile.am b/src/libph_socket/Makefile.am
index 60fa592..8b03c5b 100644
--- a/src/libph_socket/Makefile.am
+++ b/src/libph_socket/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = libph_socket.a
 
diff --git a/src/pstn/Makefile.am b/src/pstn/Makefile.am
index 4cb035b..f8ed0bc 100644
--- a/src/pstn/Makefile.am
+++ b/src/pstn/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 bin_PROGRAMS = \
 	osmo-cc-pstn-endpoint