Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am

This commit is contained in:
Michael Liebmann
2013-10-14 16:32:39 +02:00
parent a47091872b
commit 5091e920fc
29 changed files with 88 additions and 88 deletions

View File

@@ -2,7 +2,7 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
SUBDIRS = pictureviewer audiodec
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -45,9 +45,9 @@ libneutrino_driver_a_SOURCES += \
vfd.cpp
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
@@ -55,7 +55,7 @@ libneutrino_driver_a_SOURCES += \
newclock.cpp \
lcdd.cpp
INCLUDES += \
AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libtriple
endif

View File

@@ -1,6 +1,6 @@
AM_CXXFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -13,13 +13,13 @@ INCLUDES = \
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libneutrino_driver_audiodec.a

View File

@@ -1,6 +1,6 @@
AM_CXXFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -11,13 +11,13 @@ INCLUDES = \
if BOXTYPE_COOL
if BOXMODEL_APOLLO
INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
INCLUDES += -I$(top_srcdir)/lib/libtriple
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libneutrino_pictureviewer.a