[beast/temp-rc1] BUILD: use AM_CPPFLAGS instead of the deprecated INCLUDES variable

From: Tim Janik <timj src gnome org>
To: commits-list gnome org
Cc:
Subject: [beast/temp-rc1] BUILD: use AM_CPPFLAGS instead of the deprecated INCLUDES variable
Date: Wed, 22 Oct 2014 05:47:03 +0000 (UTC)
commit 9ff272c322fe2116c5e21563db8ef77e72717993
Author: Tim Janik <timj gnu org>
Date:   Fri Oct 17 05:05:52 2014 +0200

    BUILD: use AM_CPPFLAGS instead of the deprecated INCLUDES variable

 Makefile.decl                     |    1 -
 beast-gtk/Makefile.am             |    2 +-
 beast-gtk/gxk/Makefile.am         |    2 +-
 bse/Makefile.am                   |    7 ++-----
 bse/tests/Makefile.am             |    2 +-
 bse/zintern/Makefile.am           |    2 +-
 drivers/Makefile.am               |    2 +-
 drivers/bse-portaudio/Makefile.am |    2 +-
 launchers/Makefile.am             |    2 +-
 plugins/Makefile.am               |    2 +-
 plugins/evaluator/Makefile.am     |    4 ++--
 plugins/freeverb/Makefile.am      |    2 +-
 sfi/Makefile.am                   |    2 +-
 sfi/tests/Makefile.am             |    2 +-
 shell/Makefile.am                 |    7 ++-----
 tests/Makefile.am                 |    2 +-
 tests/bse/Makefile.am             |    2 +-
 tests/filecheck/Makefile.am       |    2 +-
 tests/latency/Makefile.am         |    2 +-
 tools/Makefile.am                 |    2 +-
 20 files changed, 22 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.decl b/Makefile.decl
index 1b1e44a..83b6b0b 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -4,7 +4,6 @@
 ## GNU Lesser General Public License version 2 or any later version.
 
 # declare variables that we might want to use += on.
-INCLUDES=
 EXTRA_HEADERS=
 MAINTAINERCLEANFILES=$(GENERATED)
 CLEANFILES=$(GENERATED_CLEANFILES)
diff --git a/beast-gtk/Makefile.am b/beast-gtk/Makefile.am
index de9a7e7..60dcdbe 100644
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gxk dialogs icons
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BEAST\""
 AM_CXXFLAGS += $(BEAST_CFLAGS) $(GXK_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE \
                        -DG_DISABLE_CONST_RETURNS -DGTK_ENABLE_BROKEN # -DGTK_DISABLE_DEPRECATED 
-DGTK_DISABLE_COMPAT_H
diff --git a/beast-gtk/gxk/Makefile.am b/beast-gtk/gxk/Makefile.am
index d809345..dc852ba 100644
--- a/beast-gtk/gxk/Makefile.am
+++ b/beast-gtk/gxk/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS =
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/beast-gtk -I$(top_builddir)/beast-gtk 
-I$(srcdir) # -I.. for <gxk/*.h> includes
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/beast-gtk -I$(top_builddir)/beast-gtk 
-I$(srcdir) # -I.. for <gxk/*.h> includes
 DEFS        += @DEFINE__FILE_DIR__@ -DGTK_DISABLE_COMPAT_H -DGXK_COMPILATION -DG_LOG_DOMAIN=\"GXK\" # 
-DGTK_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS -DGTK_ENABLE_BROKEN
 AM_CXXFLAGS += $(GXK_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 AM_CFLAGS   += $(GXK_CFLAGS)
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 36e7cb8..87e68ee 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -7,11 +7,8 @@ SUBDIRS = icons zintern . tests
 # need -I$(top_builddir) for <sfi/sficonfig.h>
 # need -I$(srcdir) for "bseserver.hh" in .genprc.cc
 # need -I. (builddir) for "bsebasics.genidl.hh" in bsebasics.cc
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
-DEFS     += @DEFINE__FILE_DIR__@ $(strip \
-       $(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \
-                     $(filter $(<F), $(bse_sources) $(bse_sources))) \
-)
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
+DEFS        += @DEFINE__FILE_DIR__@ $(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, $(filter $(<F), 
$(bse_sources) $(bse_sources))) 
 AM_CXXFLAGS  += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE -DG_DISABLE_DEPRECATED 
-DG_DISABLE_CONST_RETURNS
 AIDACC_VDEBUG = $(AIDACC) $(if $(findstring 1, $(V)), --aida-debug)
 
diff --git a/bse/tests/Makefile.am b/bse/tests/Makefile.am
index 93d3142..a8a2bf4 100644
--- a/bse/tests/Makefile.am
+++ b/bse/tests/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS =
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir)
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"BSE-TEST\" # -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS += $(BSE_CFLAGS) $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
diff --git a/bse/zintern/Makefile.am b/bse/zintern/Makefile.am
index d9d232b..7cd7251 100644
--- a/bse/zintern/Makefile.am
+++ b/bse/zintern/Makefile.am
@@ -1,7 +1,7 @@
 # BEAST - Better Audio System
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir)
 AM_CXXFLAGS += $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
 ZINTERN      = rapicorn-zintern
 
diff --git a/drivers/Makefile.am b/drivers/Makefile.am
index a514b08..8ebb2cd 100644
--- a/drivers/Makefile.am
+++ b/drivers/Makefile.am
@@ -1,7 +1,7 @@
 # BSE-Plugins - Better Sound Engine dynamic Plugins
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES    += -I$(top_srcdir) -I.
+AM_CPPFLAGS += -I$(top_srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ $(strip -DG_LOG_DOMAIN=\"BSE-ALSA\")
 AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
diff --git a/drivers/bse-portaudio/Makefile.am b/drivers/bse-portaudio/Makefile.am
index ca388f5..af338ea 100644
--- a/drivers/bse-portaudio/Makefile.am
+++ b/drivers/bse-portaudio/Makefile.am
@@ -1,6 +1,6 @@
 # BSE-PortAudio - Better Sound Engine PortAudio Driver Package
 
-INCLUDES    += -I$(srcdir) -I$(top_builddir)
+AM_CPPFLAGS += -I$(srcdir) -I$(top_builddir)
 DEFS        += @DEFINE__FILE_DIR__@ $(strip -DG_LOG_DOMAIN=\"BSE-PortAudio\")
 AM_CXXFLAGS += $(BSE_CFLAGS)
 
diff --git a/launchers/Makefile.am b/launchers/Makefile.am
index c1bc26b..1048c50 100644
--- a/launchers/Makefile.am
+++ b/launchers/Makefile.am
@@ -1,7 +1,7 @@
 # launchers - Beast program starters
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DBINDIR=\"$(bindir)\"
 AM_CXXFLAGS += $(LAUNCHER_CFLAGS) -DG_DISABLE_CONST_RETURNS
 
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 4af2d1b..5941c23 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = icons . freeverb # evaluator
 
-INCLUDES    += -I$(top_srcdir) -I.
+AM_CPPFLAGS += -I$(top_srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
 AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE -D_BIRNET_SOURCE_EXTENSIONS
 
diff --git a/plugins/evaluator/Makefile.am b/plugins/evaluator/Makefile.am
index f7ebfbe..b40e523 100644
--- a/plugins/evaluator/Makefile.am
+++ b/plugins/evaluator/Makefile.am
@@ -11,8 +11,8 @@ include $(top_srcdir)/Makefile.decl
 
 ## Evaluator Makefile
 #
-#INCLUDES += -I$(top_srcdir) -I. $(BSE_CFLAGS) -DG_LOG_DOMAIN=BSE_PLUGIN_NAME
-#INCLUDES += -DBSE_PLUGIN_FALLBACK="\"$(strip $(basename $(<F)))\""
+#AM_CPPFLAGS += -I$(top_srcdir) -I. $(BSE_CFLAGS) -DG_LOG_DOMAIN=BSE_PLUGIN_NAME
+#AM_CPPFLAGS += -DBSE_PLUGIN_FALLBACK="\"$(strip $(basename $(<F)))\""
 #
 ## install plugins under:
 #plugindir = $(bseplugindir)
diff --git a/plugins/freeverb/Makefile.am b/plugins/freeverb/Makefile.am
index 9960d52..6b15bd8 100644
--- a/plugins/freeverb/Makefile.am
+++ b/plugins/freeverb/Makefile.am
@@ -1,7 +1,7 @@
 # Freeverb Makefile
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES    += -I$(top_srcdir) -I.
+AM_CPPFLAGS += -I$(top_srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
 AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index 37670d6..16ea9a8 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS   = . tests
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS)
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS)
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"SFI\" -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
diff --git a/sfi/tests/Makefile.am b/sfi/tests/Makefile.am
index f265207..b874152 100644
--- a/sfi/tests/Makefile.am
+++ b/sfi/tests/Makefile.am
@@ -2,7 +2,7 @@
 # Copyright (C) 2006 Tim Janik
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I.
 DEFS       += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID # 
-DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 1473d48..a854202 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,11 +1,8 @@
 # SHELL - Better Sound Engine Shell
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I. -I$(top_builddir)
-DEFS += @DEFINE__FILE_DIR__@ $(strip                           \
-       -DG_LOG_DOMAIN=\"BSESCM\"       \
-       $(SUIDMAIN_DEFS)                \
-)
+AM_CPPFLAGS += -I$(top_srcdir) -I. -I$(top_builddir)
+DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"BSESCM\" $(SUIDMAIN_DEFS)
 AM_CXXFLAGS += $(BSESCM_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE 
-DG_DISABLE_CONST_RETURNS
 
 #
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9baa5a1..8697230 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = . latency scripts bse audio filecheck
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 AM_CFLAGS   += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
diff --git a/tests/bse/Makefile.am b/tests/bse/Makefile.am
index 02011f4..8f8d686 100644
--- a/tests/bse/Makefile.am
+++ b/tests/bse/Makefile.am
@@ -1,7 +1,7 @@
 # beast/tests/bse
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
diff --git a/tests/filecheck/Makefile.am b/tests/filecheck/Makefile.am
index 1747a5e..be5c125 100644
--- a/tests/filecheck/Makefile.am
+++ b/tests/filecheck/Makefile.am
@@ -1,7 +1,7 @@
 # beast/tests/filecheck
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS += $(SFI_CFLAGS)
 
diff --git a/tests/latency/Makefile.am b/tests/latency/Makefile.am
index 87e618e..90e5351 100644
--- a/tests/latency/Makefile.am
+++ b/tests/latency/Makefile.am
@@ -1,7 +1,7 @@
 # BSE - Better Sound Engine
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b7527ba..3ff9247 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = . scripts
 
-INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir)
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"BSE-TOOLS\" -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]