From 5689a3b7449bde69ce6276b3b348f98d07c856cf Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Tue, 11 Dec 2012 23:59:31 +0100 Subject: build: Don't use the deprecated INCLUDES in the various Makefile.am Signed-off-by: Sylvain Munaut --- src/Makefile.am | 3 +-- src/codec/Makefile.am | 3 +-- src/gb/Makefile.am | 3 +-- src/gsm/Makefile.am | 3 +-- src/vty/Makefile.am | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index d719df7c..b425ea19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,8 +2,7 @@ # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification LIBVERSION=4:0:0 -INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include -AM_CFLAGS = -Wall +AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include lib_LTLIBRARIES = libosmocore.la diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index 665768c6..6110cbf7 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -2,8 +2,7 @@ # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification LIBVERSION=0:0:0 -INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall +AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include lib_LTLIBRARIES = libosmocodec.la diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 04d21085..8b7473db 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -2,8 +2,7 @@ # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification LIBVERSION=2:0:0 -INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing +AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing $(all_includes) -I$(top_srcdir)/include # FIXME: this should eventually go into a milenage/Makefile.am noinst_HEADERS = common_vty.h diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 0544e0a1..6e2a785e 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -2,8 +2,7 @@ # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification LIBVERSION=3:0:0 -INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} +AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} $(all_includes) -I$(top_srcdir)/include # FIXME: this should eventually go into a milenage/Makefile.am noinst_HEADERS = milenage/aes.h milenage/aes_i.h milenage/aes_wrap.h \ diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 61111235..76d7f271 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -2,8 +2,7 @@ # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification LIBVERSION=0:0:0 -INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall +AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include if ENABLE_VTY lib_LTLIBRARIES = libosmovty.la -- cgit v1.2.3