mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libdvbsub/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -6,16 +6,16 @@ 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
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS += -fno-rtti -fno-exceptions
noinst_LIBRARIES = libdvbsub.a

12
lib/libmd5sum/Makefile.am
View File

@@ -1,12 +1,12 @@
noinst_LIBRARIES = libtuxbox-md5sum.a
#not allowed cppflags for c files - fix your code to re-enable
#AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS =
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)
#not allowed cppflags for c files - fix your code to re-enable
#AM_CPPFLAGS += -fno-rtti -fno-exceptions
#AM_CPPFLAGS +=
libtuxbox_md5sum_a_SOURCES = libmd5sum.c md5.c

4
lib/libtriple/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \
@@ -8,7 +8,7 @@ INCLUDES = \
noinst_LIBRARIES = libtriple.a
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS += -fno-rtti -fno-exceptions
libtriple_a_SOURCES = \
dmx_td.cpp \

10
lib/libtuxtxt/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -7,17 +7,17 @@ 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
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS += -fno-rtti -fno-exceptions
noinst_LIBRARIES = libtuxtxt.a

2
lib/libupnpclient/Makefile.am
View File

@@ -2,7 +2,7 @@ noinst_LIBRARIES = libtuxbox-upnpclient.a
AM_CPPFLAGS = -fno-rtti
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_srcdir)/lib/xmltree
libtuxbox_upnpclient_a_SOURCES = UPNPSocket.cpp UPNPDevice.cpp UPNPService.cpp

4
lib/sectionsdclient/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/lib/connection \
@@ -6,7 +6,7 @@ INCLUDES = \
noinst_LIBRARIES = libsectionsdclient.a
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS += -fno-rtti -fno-exceptions
libsectionsdclient_a_SOURCES = sectionsdclient.cpp

4
lib/timerdclient/Makefile.am
View File

@@ -1,10 +1,10 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/libeventserver
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS += -fno-rtti -fno-exceptions
noinst_LIBRARIES = libtimerdclient.a

2
lib/xmltree/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(srcdir)/xmltok

10
src/Makefile.am
View File

@@ -8,7 +8,7 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
SUBDIRS = zapit gui daemonc driver system eitd timerd nhttpd
INCLUDES = \
AM_CPPFLAGS = \
-I$(srcdir) \
-I$(top_builddir) \
-I$(top_srcdir) \
@@ -26,14 +26,14 @@ 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
SUBDIRS += lcddisplay
INCLUDES += -I$(top_srcdir)/lib/libtriple
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
if USE_TREMOR
@@ -46,7 +46,7 @@ bin_PROGRAMS = neutrino
neutrino_SOURCES = neutrino_menue.cpp neutrino.cpp
AM_CPPFLAGS = -D_FILE_OFFSET_BITS=64
AM_CPPFLAGS += -D_FILE_OFFSET_BITS=64
if ENABLE_FLAC
FLACLIBS = -lFLAC

8
src/daemonc/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -14,13 +14,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_daemonc.a

8
src/driver/Makefile.am
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

8
src/driver/audiodec/Makefile.am
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

8
src/driver/pictureviewer/Makefile.am
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

10
src/eitd/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -11,17 +11,17 @@ 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
#AM_CPPFLAGS =
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
AM_CPPFLAGS += -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
noinst_LIBRARIES = libsectionsd.a
libsectionsd_a_SOURCES = \

8
src/gui/Makefile.am
View File

@@ -15,7 +15,7 @@ noinst_HEADERS = version.h
SUBDIRS = bedit components widget
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -32,14 +32,14 @@ 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 = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a

6
src/gui/bedit/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -13,9 +13,9 @@ 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

6
src/gui/components/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -13,9 +13,9 @@ 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

8
src/gui/widget/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
@@ -12,14 +12,14 @@ 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_gui_widget.a libneutrino_gui_widget2.a

2
src/nhttpd/Makefile.am
View File

@@ -2,7 +2,7 @@ SUBDIRS = yhttpd_core yhttpd_mods tuxboxapi web
AM_CPPFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
AM_CPPFLAGS += \
-I$(srcdir) \
-I$(top_builddir) \
-I$(top_srcdir) \

8
src/nhttpd/tuxboxapi/coolstream/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \
@@ -17,13 +17,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 = libnhttpd_tuxboxapi.a

2
src/nhttpd/tuxboxapi/dbox/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/src \

4
src/nhttpd/yhttpd_core/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(srcdir) \
-I$(top_builddir) \
-I$(top_srcdir) \
@@ -11,7 +11,7 @@ INCLUDES = \
-I$(top_srcdir)/lib/libconfigfile \
@FREETYPE_CFLAGS@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS += -fno-rtti -fno-exceptions
noinst_LIBRARIES = libyhttpd.a

4
src/nhttpd/yhttpd_mods/Makefile.am
View File

@@ -1,4 +1,4 @@
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \
@@ -10,7 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/lib/libconfigfile \
@FREETYPE_CFLAGS@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS += -fno-rtti -fno-exceptions
noinst_LIBRARIES = libyhttpdmods.a

8
src/system/Makefile.am
View File

@@ -4,7 +4,7 @@ endif
AM_CXXFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \
@@ -20,13 +20,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_system.a

6
src/system/mtdutils/Makefile.am
View File

@@ -2,7 +2,7 @@ AM_CXXFLAGS = -D__STDC_FORMAT_MACROS
SUBDIRS = lib
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \
@@ -10,9 +10,9 @@ INCLUDES = \
-I$(top_srcdir)/src/system/mtdutils/include
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
noinst_LIBRARIES = libneutrino_system_mtdutils.a

2
src/system/mtdutils/lib/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CXXFLAGS = -D__STDC_FORMAT_MACROS
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \

2
src/timerd/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \

2
src/zapit/lib/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
AM_CPPFLAGS += \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src/zapit/include \

8
src/zapit/src/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
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 = libzapit.a