2014-08-14 Fred Gleason <fredg@paravelsystems.com>

* Amalgamated INCLUDE Makefile entries into AM_CPPFLAGS. * Added '-Wno-portability' to the invocation of 'automake' in 'autogen.sh'.
2025-05-25 16:58:04 +02:00 · 2014-08-14 13:20:26 -04:00 · 2014-08-14 13:20:26 -04:00 · 6532b723b2
commit 6532b723b2
parent 8c7dd1d861
47 changed files with 49 additions and 89 deletions
--- a/4
+++ b/4
@ -14300,3 +14300,7 @@
 	to fix broken compilation on RHEL 7.
 	* Fixed a regression in 'lib/rdcreate_log.cpp' that broke creation
 	of new logs.
+2014-08-14 Fred Gleason <fredg@paravelsystems.com>
+	* Amalgamated INCLUDE Makefile entries into AM_CPPFLAGS.
+	* Added '-Wno-portability' to the invocation of 'automake' in
+	'autogen.sh'.
--- a/autogen.sh
+++ b/autogen.sh
@ -37,7 +37,7 @@ aclocal $ACLOCAL_FLAGS || {
    exit 1
 }

-automake --add-missing || {
+automake --add-missing -Wno-portability || {
    echo "automake --add-missing failed, exiting..."
    exit 1
 }
--- a/cae/Makefile.am
+++ b/cae/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi
+AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
 MOC = @QT_MOC@

--- a/configure.ac
+++ b/configure.ac
--- a/importers/Makefile.am
+++ b/importers/Makefile.am
@ -23,8 +23,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/pam_rd/Makefile.am
+++ b/pam_rd/Makefile.am
@ -23,8 +23,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" -fPIC @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" -fPIC @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdadmin/Makefile.am
+++ b/rdadmin/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@
 CWRAP = ../helpers/cwrap
--- a/rdairplay/Makefile.am
+++ b/rdairplay/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdcartslots/Makefile.am
+++ b/rdcartslots/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdcastmanager/Makefile.am
+++ b/rdcastmanager/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdcatch/Makefile.am
+++ b/rdcatch/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdcatchd/Makefile.am
+++ b/rdcatchd/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdhpi/Makefile.am
+++ b/rdhpi/Makefile.am
@ -24,8 +24,7 @@
 ##   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@
 CWRAP = ../helpers/cwrap
--- a/rdlibrary/Makefile.am
+++ b/rdlibrary/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdlogedit/Makefile.am
+++ b/rdlogedit/Makefile.am
@ -22,8 +22,7 @@
 ##   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdlogin/Makefile.am
+++ b/rdlogin/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdlogmanager/Makefile.am
+++ b/rdlogmanager/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdmonitor/Makefile.am
+++ b/rdmonitor/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdpanel/Makefile.am
+++ b/rdpanel/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdrepld/Makefile.am
+++ b/rdrepld/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/rdselect/Makefile.am
+++ b/rdselect/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/ripcd/Makefile.am
+++ b/ripcd/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -22,8 +22,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@ -48,8 +48,7 @@ SUBDIRS = $(ALSACONFIG_RD_OPT)\
          rdsoftkeys\
          sas_shim

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdalsaconfig/Makefile.am
+++ b/utils/rdalsaconfig/Makefile.am
@ -22,8 +22,7 @@
 ##   Use automake to process this into a Makefile.in
 ##

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
 MOC = @QT_MOC@

--- a/utils/rdcheckcuts/Makefile.am
+++ b/utils/rdcheckcuts/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdchunk/Makefile.am
+++ b/utils/rdchunk/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdcollect/Makefile.am
+++ b/utils/rdcollect/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rddbcheck/Makefile.am
+++ b/utils/rddbcheck/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rddelete/Makefile.am
+++ b/utils/rddelete/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rddgimport/Makefile.am
+++ b/utils/rddgimport/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rddiscimport/Makefile.am
+++ b/utils/rddiscimport/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdgen/Makefile.am
+++ b/utils/rdgen/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdgpimon/Makefile.am
+++ b/utils/rdgpimon/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdhpiinfo/Makefile.am
+++ b/utils/rdhpiinfo/Makefile.am
@ -22,8 +22,7 @@
 ##   Use automake to process this into a Makefile.in
 ##

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
 MOC = @QT_MOC@

--- a/utils/rdimport/Makefile.am
+++ b/utils/rdimport/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdmaint/Makefile.am
+++ b/utils/rdmaint/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdmarkerset/Makefile.am
+++ b/utils/rdmarkerset/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdpopup/Makefile.am
+++ b/utils/rdpopup/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdpurgecasts/Makefile.am
+++ b/utils/rdpurgecasts/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rdsoftkeys/Makefile.am
+++ b/utils/rdsoftkeys/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/rmlsend/Makefile.am
+++ b/utils/rmlsend/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/utils/sas_shim/Makefile.am
+++ b/utils/sas_shim/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/web/Makefile.am
+++ b/web/Makefile.am
@ -27,8 +27,7 @@ SUBDIRS = rdcastmanager\
          rdxport\
          tests

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/web/rdcastmanager/Makefile.am
+++ b/web/rdcastmanager/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/web/rdfeed/Makefile.am
+++ b/web/rdfeed/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@

--- a/web/rdxport/Makefile.am
+++ b/web/rdxport/Makefile.am
@ -21,8 +21,7 @@
 ##
 ## Use automake to process this into a Makefile.in

-AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@
-INCLUDES = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
 LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
 MOC = @QT_MOC@