File x.patch of Package osmo-cc-router

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 -Wmissing-prototypes -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra -Wmissing-prototypes \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = libdtmf.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 -Wmissing-prototypes -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra -Wmissing-prototypes \
+        $(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 -Wmissing-prototypes -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra -Wmissing-prototypes \
+        $(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 -Wmissing-prototypes -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra -Wmissing-prototypes \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = liboptions.a
 
diff --git a/src/libsample/Makefile.am b/src/libsample/Makefile.am
index 5ae865c..b59d33c 100644
--- a/src/libsample/Makefile.am
+++ b/src/libsample/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -Wmissing-prototypes -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra -Wmissing-prototypes \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = libsample.a
 
diff --git a/src/libwave/Makefile.am b/src/libwave/Makefile.am
index c573515..7e2c382 100644
--- a/src/libwave/Makefile.am
+++ b/src/libwave/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -Wmissing-prototypes -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra -Wmissing-prototypes \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 noinst_LIBRARIES = libwave.a
 
diff --git a/src/router/Makefile.am b/src/router/Makefile.am
index 51ef4cd..06c833a 100644
--- a/src/router/Makefile.am
+++ b/src/router/Makefile.am
@@ -1,4 +1,11 @@
-AM_CPPFLAGS = -Wall -Wextra -Wmissing-prototypes -g $(all_includes)
+AM_CPPFLAGS = \
+        $(all_includes) \
+        $(NULL)
+
+AM_CFLAGS = \
+        -Wall -Wextra -Wmissing-prototypes \
+        $(LIBOSMOCORE_CFLAGS) \
+        $(NULL)
 
 bin_PROGRAMS = \
 	osmo-cc-router