diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-11-09 02:27:25 +0700 |
|---|---|---|
| committer | fixeria <vyanitskiy@sysmocom.de> | 2022-11-10 16:07:03 +0000 |
| commit | 8fbaad69039287137648c66cbb7f5c91ad1449ad (patch) | |
| tree | 58a4c47e9a233c75920f801d0117b98359710e38 /src | |
| parent | 6dda35a80f0e232eeab57cbebf5a77e6484d8b9e (diff) | |
*/Makefile.am: do not mix up AM_CFLAGS with AM_CPPFLAGS
Change-Id: I2c1d5f9c61714f487fbbe60603b2682f2c0a4c6b
Diffstat (limited to 'src')
| -rw-r--r-- | src/codec/Makefile.am | 4 | ||||
| -rw-r--r-- | src/coding/Makefile.am | 5 | ||||
| -rw-r--r-- | src/ctrl/Makefile.am | 3 | ||||
| -rw-r--r-- | src/gsm/Makefile.am | 6 | ||||
| -rw-r--r-- | src/pseudotalloc/Makefile.am | 3 |
5 files changed, 11 insertions, 10 deletions
diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index b712591e..de8de1bf 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -3,8 +3,8 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=3:1:3 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) -AM_CFLAGS = -Wall +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index 9a24f389..5ce3cbfc 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -5,9 +5,8 @@ LIBVERSION=2:0:2 AM_CPPFLAGS = \ -I"$(top_srcdir)/include" \ - -I"$(top_builddir)/include" \ - $(TALLOC_CFLAGS) -AM_CFLAGS = -Wall + -I"$(top_builddir)/include" +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 5921f048..e53594d4 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -3,7 +3,8 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=7:0:7 -AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_CTRL lib_LTLIBRARIES = libosmoctrl.la diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index a3820d75..0d66476d 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -3,8 +3,8 @@ # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html LIBVERSION=18:0:0 -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) -AM_CFLAGS = -Wall +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) if ENABLE_PSEUDOTALLOC AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc @@ -43,7 +43,7 @@ libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-und libosmogsm_la_LIBADD = libgsmint.la $(TALLOC_LIBS) if ENABLE_GNUTLS -AM_CPPFLAGS += $(LIBGNUTLS_CFLAGS) +AM_CFLAGS += $(LIBGNUTLS_CFLAGS) libosmogsm_la_LIBADD += $(LIBGNUTLS_LIBS) else noinst_HEADERS += kdf/sha1.h kdf/sha256.h kdf/common.h kdf/sha1_i.h kdf/sha256_i.h diff --git a/src/pseudotalloc/Makefile.am b/src/pseudotalloc/Makefile.am index 3c78bba8..b631eca9 100644 --- a/src/pseudotalloc/Makefile.am +++ b/src/pseudotalloc/Makefile.am @@ -1,4 +1,5 @@ -AM_CFLAGS = -Wall -I. $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I. $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CFLAGS = -Wall if ENABLE_PSEUDOTALLOC |