diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am index ae9ce161c..16b351cc9 100644 --- a/lib/libdvbsub/Makefile.am +++ b/lib/libdvbsub/Makefile.am @@ -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 diff --git a/lib/libmd5sum/Makefile.am b/lib/libmd5sum/Makefile.am index cb8658fe8..55a647350 100644 --- a/lib/libmd5sum/Makefile.am +++ b/lib/libmd5sum/Makefile.am @@ -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 diff --git a/lib/libtriple/Makefile.am b/lib/libtriple/Makefile.am index ee7d2b627..4ac1550ca 100644 --- a/lib/libtriple/Makefile.am +++ b/lib/libtriple/Makefile.am @@ -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 \ diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am index 8c3a80248..f88bc9847 100644 --- a/lib/libtuxtxt/Makefile.am +++ b/lib/libtuxtxt/Makefile.am @@ -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 diff --git a/lib/libupnpclient/Makefile.am b/lib/libupnpclient/Makefile.am index 87168ef65..737921751 100644 --- a/lib/libupnpclient/Makefile.am +++ b/lib/libupnpclient/Makefile.am @@ -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 diff --git a/lib/sectionsdclient/Makefile.am b/lib/sectionsdclient/Makefile.am index 679d183e4..016fb6603 100644 --- a/lib/sectionsdclient/Makefile.am +++ b/lib/sectionsdclient/Makefile.am @@ -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 diff --git a/lib/timerdclient/Makefile.am b/lib/timerdclient/Makefile.am index ead4c2c73..ce2f0f72d 100644 --- a/lib/timerdclient/Makefile.am +++ b/lib/timerdclient/Makefile.am @@ -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 diff --git a/lib/xmltree/Makefile.am b/lib/xmltree/Makefile.am index ab256f85a..b02b21b15 100644 --- a/lib/xmltree/Makefile.am +++ b/lib/xmltree/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(srcdir)/xmltok diff --git a/src/Makefile.am b/src/Makefile.am index 3d73cf35f..a34f695cd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/daemonc/Makefile.am b/src/daemonc/Makefile.am index 662ce83c5..1132e999a 100644 --- a/src/daemonc/Makefile.am +++ b/src/daemonc/Makefile.am @@ -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 diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index 55cbdd75e..8e6955669 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -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 diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am index 7062712bd..4fde05396 100644 --- a/src/driver/audiodec/Makefile.am +++ b/src/driver/audiodec/Makefile.am @@ -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 diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am index f5aab0692..8cf4d7404 100644 --- a/src/driver/pictureviewer/Makefile.am +++ b/src/driver/pictureviewer/Makefile.am @@ -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 diff --git a/src/eitd/Makefile.am b/src/eitd/Makefile.am index f4d4ed271..e98b87194 100644 --- a/src/eitd/Makefile.am +++ b/src/eitd/Makefile.am @@ -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 = \ diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index bc3a64bc3..37dd4915a 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -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 diff --git a/src/gui/bedit/Makefile.am b/src/gui/bedit/Makefile.am index 871b56919..c1c0ad56b 100644 --- a/src/gui/bedit/Makefile.am +++ b/src/gui/bedit/Makefile.am @@ -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 diff --git a/src/gui/components/Makefile.am b/src/gui/components/Makefile.am index 5181dc19e..0a3da2fbb 100644 --- a/src/gui/components/Makefile.am +++ b/src/gui/components/Makefile.am @@ -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 diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am index df5c3ed58..33dd69179 100644 --- a/src/gui/widget/Makefile.am +++ b/src/gui/widget/Makefile.am @@ -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 diff --git a/src/nhttpd/Makefile.am b/src/nhttpd/Makefile.am index 1e1ea948d..dfd2195f3 100644 --- a/src/nhttpd/Makefile.am +++ b/src/nhttpd/Makefile.am @@ -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) \ diff --git a/src/nhttpd/tuxboxapi/coolstream/Makefile.am b/src/nhttpd/tuxboxapi/coolstream/Makefile.am index 518dcc7f1..af0e7e604 100644 --- a/src/nhttpd/tuxboxapi/coolstream/Makefile.am +++ b/src/nhttpd/tuxboxapi/coolstream/Makefile.am @@ -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 diff --git a/src/nhttpd/tuxboxapi/dbox/Makefile.am b/src/nhttpd/tuxboxapi/dbox/Makefile.am index 5e7aed6f5..6c341a62a 100644 --- a/src/nhttpd/tuxboxapi/dbox/Makefile.am +++ b/src/nhttpd/tuxboxapi/dbox/Makefile.am @@ -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 \ diff --git a/src/nhttpd/yhttpd_core/Makefile.am b/src/nhttpd/yhttpd_core/Makefile.am index de0679d2b..1a0a81aaa 100644 --- a/src/nhttpd/yhttpd_core/Makefile.am +++ b/src/nhttpd/yhttpd_core/Makefile.am @@ -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 diff --git a/src/nhttpd/yhttpd_mods/Makefile.am b/src/nhttpd/yhttpd_mods/Makefile.am index 6f7f05823..fc85656f3 100644 --- a/src/nhttpd/yhttpd_mods/Makefile.am +++ b/src/nhttpd/yhttpd_mods/Makefile.am @@ -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 diff --git a/src/system/Makefile.am b/src/system/Makefile.am index 49bab1c92..11bad7cd8 100644 --- a/src/system/Makefile.am +++ b/src/system/Makefile.am @@ -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 diff --git a/src/system/mtdutils/Makefile.am b/src/system/mtdutils/Makefile.am index 2e79b98fb..650005a38 100644 --- a/src/system/mtdutils/Makefile.am +++ b/src/system/mtdutils/Makefile.am @@ -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 diff --git a/src/system/mtdutils/lib/Makefile.am b/src/system/mtdutils/lib/Makefile.am index 1d62a9cdb..8429b5e72 100644 --- a/src/system/mtdutils/lib/Makefile.am +++ b/src/system/mtdutils/lib/Makefile.am @@ -1,6 +1,6 @@ AM_CXXFLAGS = -D__STDC_FORMAT_MACROS -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ diff --git a/src/timerd/Makefile.am b/src/timerd/Makefile.am index 716ce2a95..c3b397da7 100644 --- a/src/timerd/Makefile.am +++ b/src/timerd/Makefile.am @@ -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 \ diff --git a/src/zapit/lib/Makefile.am b/src/zapit/lib/Makefile.am index 99aa86869..2d884b259 100644 --- a/src/zapit/lib/Makefile.am +++ b/src/zapit/lib/Makefile.am @@ -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 \ diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am index 9c687d1a6..5169a27af 100644 --- a/src/zapit/src/Makefile.am +++ b/src/zapit/src/Makefile.am @@ -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