[beast/devel: 5/12] BUILD: add -D__FILE_DIR__ to compilation

From: Tim Janik <timj src gnome org>
To: commits-list gnome org
Cc:
Subject: [beast/devel: 5/12] BUILD: add -D__FILE_DIR__ to compilation
Date: Wed, 20 Mar 2013 05:03:35 +0000 (UTC)
commit 19847e104590ec9e740044ddb917be2f805600e3
Author: Tim Janik <timj gnu org>
Date:   Wed Mar 20 05:03:57 2013 +0100

    BUILD: add -D__FILE_DIR__ to compilation

 beast-gtk/Makefile.am             |    4 ++--
 beast-gtk/gxk/Makefile.am         |    2 +-
 birnet/Makefile.am                |    2 +-
 birnet/tests/Makefile.am          |    2 +-
 bse/Makefile.am                   |    2 +-
 bse/tests/Makefile.am             |    2 +-
 drivers/Makefile.am               |    2 +-
 drivers/bse-portaudio/Makefile.am |    2 +-
 launchers/Makefile.am             |    2 +-
 plugins/Makefile.am               |    2 +-
 plugins/freeverb/Makefile.am      |    2 +-
 sfi/Makefile.am                   |    2 +-
 sfi/tests/Makefile.am             |    2 +-
 shell/Makefile.am                 |    2 +-
 tests/Makefile.am                 |    2 +-
 tests/bse/Makefile.am             |    2 +-
 tests/filecheck/Makefile.am       |    2 +-
 tests/latency/Makefile.am         |    2 +-
 tools/Makefile.am                 |    2 +-
 19 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/beast-gtk/Makefile.am b/beast-gtk/Makefile.am
index 3e877b3..e1a19b3 100644
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@ -4,14 +4,14 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS = gxk dialogs icons
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
-DEFS        += -DG_LOG_DOMAIN="\"BEAST\""
+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
 
 
 # special profiling hooks
 PROFILE_SOURCE = # profile.cc
-DEFS += # $(subst profile.cc, -pg -a, $(findstring profile.cc, $(<F)))
+DEFS += @DEFINE__FILE_DIR__@ # $(subst profile.cc, -pg -a, $(findstring profile.cc, $(<F)))
 LIBS += # -lefence # -pg 
 
 #
diff --git a/beast-gtk/gxk/Makefile.am b/beast-gtk/gxk/Makefile.am
index f3f5eae..84fc785 100644
--- a/beast-gtk/gxk/Makefile.am
+++ b/beast-gtk/gxk/Makefile.am
@@ -4,7 +4,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
-DEFS        += -DGTK_DISABLE_COMPAT_H -DGXK_COMPILATION -DG_LOG_DOMAIN=\"GXK\" # -DGTK_DISABLE_DEPRECATED 
-DG_DISABLE_CONST_RETURNS -DGTK_ENABLE_BROKEN
+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/birnet/Makefile.am b/birnet/Makefile.am
index e066d9c..2ed81f4 100644
--- a/birnet/Makefile.am
+++ b/birnet/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS                = . tests
 INCLUDES       += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
-DEFS            = -DBIRNET_LOG_DOMAIN=\"BIRNET\" -D_BIRNET_SOURCE_EXTENSIONS
+DEFS           += @DEFINE__FILE_DIR__@ -DBIRNET_LOG_DOMAIN=\"BIRNET\" -D_BIRNET_SOURCE_EXTENSIONS
 AM_CXXFLAGS    = $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE $(BIRNET_CFLAGS)
 GLIB_MKENUMS    = glib-mkenums
 
diff --git a/birnet/tests/Makefile.am b/birnet/tests/Makefile.am
index 72a6e09..e7c64ce 100644
--- a/birnet/tests/Makefile.am
+++ b/birnet/tests/Makefile.am
@@ -3,7 +3,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
-DEFS       += -DBIRNET_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID -DG_DISABLE_CONST_RETURNS
+DEFS       += @DEFINE__FILE_DIR__@ -DBIRNET_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID 
-DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS  = $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE $(BIRNET_CFLAGS)
 
 noinst_PROGRAMS  = $(ALLTESTS)
diff --git a/bse/Makefile.am b/bse/Makefile.am
index d7dafb9..5e3a67f 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = icons zintern . tests
 # need -I$(srcdir) for "bseserver.hh" in .genprc.cc
 # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
-DEFS     += $(strip \
+DEFS     += @DEFINE__FILE_DIR__@ $(strip \
        $(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \
                      $(filter $(<F), $(bse_sources) $(bse_sources))) \
 )
diff --git a/bse/tests/Makefile.am b/bse/tests/Makefile.am
index b0eda7f..5f02b85 100644
--- a/bse/tests/Makefile.am
+++ b/bse/tests/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS =
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
-DEFS        += -DG_LOG_DOMAIN=\"BSE-TEST\" # -DG_DISABLE_CONST_RETURNS
+DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"BSE-TEST\" # -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS  = $(BSE_CFLAGS) $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 EXTRA_DIST += arrows.gp filter-defs.gp
diff --git a/drivers/Makefile.am b/drivers/Makefile.am
index f1010c5..3141324 100644
--- a/drivers/Makefile.am
+++ b/drivers/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I.
-DEFS         = $(strip -DG_LOG_DOMAIN=\"BSE-ALSA\")
+DEFS        += @DEFINE__FILE_DIR__@ $(strip -DG_LOG_DOMAIN=\"BSE-ALSA\")
 AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # Plugin bsedevice-alsa
diff --git a/drivers/bse-portaudio/Makefile.am b/drivers/bse-portaudio/Makefile.am
index 319d25a..17da4ad 100644
--- a/drivers/bse-portaudio/Makefile.am
+++ b/drivers/bse-portaudio/Makefile.am
@@ -1,7 +1,7 @@
 # BSE-PortAudio - Better Sound Engine PortAudio Driver Package
 
 INCLUDES    += -I$(srcdir) -I$(top_builddir)
-DEFS        += $(strip -DG_LOG_DOMAIN=\"BSE-PortAudio\")
+DEFS        += @DEFINE__FILE_DIR__@ $(strip -DG_LOG_DOMAIN=\"BSE-PortAudio\")
 AM_CXXFLAGS  = $(BSE_CFLAGS)
 
 # make automake1.9 happy
diff --git a/launchers/Makefile.am b/launchers/Makefile.am
index 9072c0f..6360ebd 100644
--- a/launchers/Makefile.am
+++ b/launchers/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
-DEFS        += -DBINDIR=\"$(bindir)\"
+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 f24e739..62be713 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS = icons . freeverb # evaluator
 
 INCLUDES    += -I$(top_srcdir) -I.
-DEFS        += -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
+DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
 AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE -D_BIRNET_SOURCE_EXTENSIONS
 
 # == IDL C++ Plugins ==
diff --git a/plugins/freeverb/Makefile.am b/plugins/freeverb/Makefile.am
index 938b233..384284e 100644
--- a/plugins/freeverb/Makefile.am
+++ b/plugins/freeverb/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I.
-DEFS        += -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
+DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
 AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # install plugins under:
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index 6865d90..7e9c8e0 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS   = . tests
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS)
-DEFS        += -DG_LOG_DOMAIN=\"SFI\" -DG_DISABLE_CONST_RETURNS
+DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"SFI\" -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 sfi_public_headers = $(strip \
diff --git a/sfi/tests/Makefile.am b/sfi/tests/Makefile.am
index f574010..b40abf0 100644
--- a/sfi/tests/Makefile.am
+++ b/sfi/tests/Makefile.am
@@ -3,7 +3,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
-DEFS       += -DG_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID # -DG_DISABLE_CONST_RETURNS
+DEFS       += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID # 
-DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 noinst_PROGRAMS   = $(ALLTESTS)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 470c48c..96f23c9 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES += -I$(top_srcdir) -I. -I$(top_builddir)
-DEFS += $(strip                        \
+DEFS += @DEFINE__FILE_DIR__@ $(strip                           \
        -DG_LOG_DOMAIN=\"BSESCM\"       \
        $(SUIDMAIN_DEFS)                \
 )
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 56d729e..08565f2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS = . latency scripts bse audio filecheck
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
-DEFS        += -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
+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 171daa2..e307547 100644
--- a/tests/bse/Makefile.am
+++ b/tests/bse/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
-DEFS        += -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
+DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 SFIDL = $(top_builddir)/sfi/sfidl
diff --git a/tests/filecheck/Makefile.am b/tests/filecheck/Makefile.am
index d906980..b9a09af 100644
--- a/tests/filecheck/Makefile.am
+++ b/tests/filecheck/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
-DEFS        += -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
+DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS  = $(SFI_CFLAGS)
 
 SFIDL = $(top_builddir)/sfi/sfidl
diff --git a/tests/latency/Makefile.am b/tests/latency/Makefile.am
index f1be112..b682914 100644
--- a/tests/latency/Makefile.am
+++ b/tests/latency/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
-DEFS        += -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
+DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # IDL Compiler
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 52522ab..3636554 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS = . scripts
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
-DEFS        += -DG_LOG_DOMAIN=\"BSE-TOOLS\" -DG_DISABLE_CONST_RETURNS
+DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"BSE-TOOLS\" -DG_DISABLE_CONST_RETURNS
 AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 noinst_PROGRAMS = $(ALLTESTS)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]