mirror of https://gerrit.osmocom.org/libosmocore
*/Makefile.am: do not mix up AM_CFLAGS with AM_CPPFLAGS
Change-Id: I2c1d5f9c61714f487fbbe60603b2682f2c0a4c6b
This commit is contained in:
parent
6dda35a80f
commit
8fbaad6903
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
|
||||
bin_PROGRAMS =
|
||||
noinst_PROGRAMS =
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS)
|
||||
AM_CFLAGS = -Wall $(PTHREAD_CFLAGS)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
|
||||
AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS)
|
||||
LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(PTHREAD_LIBS)
|
||||
|
||||
if ENABLE_UTILITIES
|
||||
|
|
Loading…
Reference in New Issue