Merge remote-tracking branch 'cst-next'

src/driver/Makefile.am

@@ -13,9 +13,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/connection \
 	-I$(top_srcdir)/lib/libeventserver \
 	@SIGC_CFLAGS@ \
-	@FREETYPE_CFLAGS@
-
-AM_CPPFLAGS += \
+	@FREETYPE_CFLAGS@ \
 	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
@@ -50,8 +48,8 @@ libneutrino_driver_a_SOURCES = \
 if BOXTYPE_COOL
 libneutrino_driver_a_SOURCES += \
 	vfd.cpp
-
 endif
+
 if BOXTYPE_TRIPLE
 libneutrino_driver_a_SOURCES += \
 	newclock.cpp \
@@ -76,4 +74,3 @@ AM_CPPFLAGS += \
 endif
 
 libneutrino_driver_netfile_a_SOURCES = netfile.cpp
-

src/driver/audiodec/Makefile.am

@@ -9,9 +9,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/lib/libconfigfile \
 	@SIGC_CFLAGS@ \
-	@FREETYPE_CFLAGS@
-
-AM_CPPFLAGS += \
+	@FREETYPE_CFLAGS@ \
 	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 

src/driver/pictureviewer/Makefile.am

@@ -11,6 +11,7 @@ AM_CPPFLAGS = \
 	@FREETYPE_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
+
 noinst_LIBRARIES = libneutrino_pictureviewer.a
 
 libneutrino_pictureviewer_a_SOURCES = \