GNOME.org
 

[rhythmbox] s/INCLUDES/AM_CPPFLAGS/ and some other stuff

commit 814444101cd4f4324afa02d62bfda2c0c7adf766
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Dec 23 10:42:30 2014 +1000

    s/INCLUDES/AM_CPPFLAGS/ and some other stuff

 Makefile.am                               |    3 ++-
 backends/Makefile.am                      |    2 +-
 backends/gstreamer/Makefile.am            |    2 +-
 doc/reference/Makefile.am                 |    2 +-
 lib/Makefile.am                           |    2 +-
 lib/libmediaplayerid/Makefile.am          |    6 +++---
 metadata/Makefile.am                      |    4 ++--
 plugins/audiocd/Makefile.am               |    2 +-
 plugins/audioscrobbler/Makefile.am        |    2 +-
 plugins/brasero-disc-recorder/Makefile.am |    2 +-
 plugins/daap/Makefile.am                  |    4 ++--
 plugins/dbus-media-server/Makefile.am     |    2 +-
 plugins/fmradio/Makefile.am               |    2 +-
 plugins/generic-player/Makefile.am        |    2 +-
 plugins/grilo/Makefile.am                 |    2 +-
 plugins/ipod/Makefile.am                  |    2 +-
 plugins/iradio/Makefile.am                |    2 +-
 plugins/lirc/Makefile.am                  |    2 +-
 plugins/mmkeys/Makefile.am                |    2 +-
 plugins/mpris/Makefile.am                 |    2 +-
 plugins/mtpdevice/Makefile.am             |    2 +-
 plugins/notification/Makefile.am          |    2 +-
 plugins/power-manager/Makefile.am         |    2 +-
 plugins/visualizer/Makefile.am            |    2 +-
 remote/dbus/Makefile.am                   |    2 +-
 rhythmdb/Makefile.am                      |    2 +-
 sample-plugins/sample-vala/Makefile.am    |    6 +++---
 sample-plugins/sample/Makefile.am         |    2 +-
 shell/Makefile.am                         |    2 +-
 sources/Makefile.am                       |    2 +-
 sources/sync/Makefile.am                  |    2 +-
 tests/Makefile.am                         |    2 +-
 widgets/Makefile.am                       |    2 +-
 33 files changed, 40 insertions(+), 39 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 320eaa2..bc954be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@ distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollke
 SUBDIRS = lib metadata rhythmdb widgets sources podcast \
        backends shell bindings sample-plugins plugins remote data po help tests doc
 
-INCLUDES = rhythmbox.h
+# what?
+#INCLUDES = rhythmbox.h
 
 EXTRA_DIST =                   \
        autogen.sh              \
diff --git a/backends/Makefile.am b/backends/Makefile.am
index 5de11c3..161700d 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -26,7 +26,7 @@ librbbackends_la_LIBADD =                             \
 
 librbbackends_la_LDFLAGS = -export-dynamic
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/backends/gstreamer/Makefile.am b/backends/gstreamer/Makefile.am
index af30028..baafb11 100644
--- a/backends/gstreamer/Makefile.am
+++ b/backends/gstreamer/Makefile.am
@@ -18,7 +18,7 @@ librbbackendsgstreamer_la_LIBADD =                    \
 
 librbbackendsgstreamer_la_LDFLAGS = -export-dynamic
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 7f92996..e16c32c 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -165,7 +165,7 @@ expand_content_files=
 
 
 
-INCLUDES=\
+AM_CPPFLAGS=\
        -I$(top_srcdir) \
        -I$(top_builddir) \
        -I$(top_builddir)/lib \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index eaf5ce6..12e3e5f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -43,7 +43,7 @@ librb_la_SOURCES =                                    \
        rb-task-progress-simple.c                       \
        rb-list-model.c
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -DSHARE_DIR=\"$(pkgdatadir)\"                   \
diff --git a/lib/libmediaplayerid/Makefile.am b/lib/libmediaplayerid/Makefile.am
index 084aebc..cda6e5f 100644
--- a/lib/libmediaplayerid/Makefile.am
+++ b/lib/libmediaplayerid/Makefile.am
@@ -12,7 +12,7 @@ libmediaplayerid_la_SOURCES =         \
        mpid-files.c                    \
        mpid-util.c
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
        $(RHYTHMBOX_CFLAGS)
 
@@ -24,7 +24,7 @@ if USE_GUDEV
 libmediaplayerid_la_SOURCES += mpid-udev.c
 EXTRA_DIST = mpid-hal.c mpid-dummy.c
 
-INCLUDES += $(GUDEV_CFLAGS)
+AM_CPPFLAGS += $(GUDEV_CFLAGS)
 libmediaplayerid_la_LIBADD = $(GUDEV_LIBS)
 
 else
@@ -34,7 +34,7 @@ if HAVE_HAL
 libmediaplayerid_la_SOURCES += mpid-hal.c
 EXTRA_DIST = mpid-udev.c mpid-dummy.c
 
-INCLUDES += $(HAL_CFLAGS)
+AM_CPPFLAGS += $(HAL_CFLAGS)
 libmediaplayerid_la_LIBADD = $(HAL_LIBS)
 
 else
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index 4d8db76..0f46b74 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS =
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
@@ -11,7 +11,7 @@ INCLUDES =                                            \
 
 INSTALLED_METADATA_HELPER=`echo rhythmbox-metadata | sed '$(transform)'`
 
-INCLUDES +=                                            \
+AM_CPPFLAGS +=                                         \
        -DLIBEXEC_DIR=\"$(libexecdir)\"                 \
        -DINSTALLED_METADATA_HELPER=\"$(INSTALLED_METADATA_HELPER)\"
 
diff --git a/plugins/audiocd/Makefile.am b/plugins/audiocd/Makefile.am
index 87cf6e2..a66fb5f 100644
--- a/plugins/audiocd/Makefile.am
+++ b/plugins/audiocd/Makefile.am
@@ -18,7 +18,7 @@ libaudiocd_la_LIBADD = \
        $(top_builddir)/shell/librhythmbox-core.la      \
        $(TOTEM_PLPARSER_LIBS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/audioscrobbler/Makefile.am b/plugins/audioscrobbler/Makefile.am
index 811e163..a8d2fad 100644
--- a/plugins/audioscrobbler/Makefile.am
+++ b/plugins/audioscrobbler/Makefile.am
@@ -33,7 +33,7 @@ libaudioscrobbler_la_LIBADD =                                 \
        $(JSON_GLIB_LIBS)                               \
        $(RHYTHMBOX_LIBS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/brasero-disc-recorder/Makefile.am b/plugins/brasero-disc-recorder/Makefile.am
index 8e4eb70..92e29d2 100644
--- a/plugins/brasero-disc-recorder/Makefile.am
+++ b/plugins/brasero-disc-recorder/Makefile.am
@@ -14,7 +14,7 @@ libcd_recorder_la_LIBADD =                            \
        $(LIBBRASERO_MEDIA_LIBS)                        \
        $(NULL)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am
index 1bdd31c..738bd75 100644
--- a/plugins/daap/Makefile.am
+++ b/plugins/daap/Makefile.am
@@ -38,7 +38,7 @@ libdaap_la_LIBADD =                                   \
        $(DMAPSHARING_LIBS)                             \
        $(RHYTHMBOX_LIBS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
@@ -64,7 +64,7 @@ INCLUDES =                                            \
 
 if USE_LIBSECRET
 libdaap_la_LIBADD += $(LIBSECRET_LIBS)
-INCLUDES += $(LIBSECRET_CFLAGS)
+AM_CPPFLAGS += $(LIBSECRET_CFLAGS)
 endif
 
 gtkbuilderdir = $(plugindatadir)
diff --git a/plugins/dbus-media-server/Makefile.am b/plugins/dbus-media-server/Makefile.am
index 87fb7e3..17808f2 100644
--- a/plugins/dbus-media-server/Makefile.am
+++ b/plugins/dbus-media-server/Makefile.am
@@ -15,7 +15,7 @@ libdbus_media_server_la_LIBADD =                                      \
        $(top_builddir)/shell/librhythmbox-core.la      \
        $(NULL)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/fmradio/Makefile.am b/plugins/fmradio/Makefile.am
index 195523a..869d1d6 100644
--- a/plugins/fmradio/Makefile.am
+++ b/plugins/fmradio/Makefile.am
@@ -15,7 +15,7 @@ libfmradio_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libfmradio_la_LIBTOOLFLAGS = --tag=disable-static
 libfmradio_la_LIBADD = $(top_builddir)/shell/librhythmbox-core.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
   -DG_LOG_DOMAIN=\"Rhythmbox\" \
   -I$(top_srcdir) \
diff --git a/plugins/generic-player/Makefile.am b/plugins/generic-player/Makefile.am
index b73018b..c5e5191 100644
--- a/plugins/generic-player/Makefile.am
+++ b/plugins/generic-player/Makefile.am
@@ -19,7 +19,7 @@ libgeneric_player_la_LDFLAGS =                                \
        $(TOTEM_PLPARSER_LIBS)                          \
        $(PLUGIN_LIBTOOL_FLAGS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/grilo/Makefile.am b/plugins/grilo/Makefile.am
index ca00506..feb28a7 100644
--- a/plugins/grilo/Makefile.am
+++ b/plugins/grilo/Makefile.am
@@ -14,7 +14,7 @@ libgrilo_la_LIBADD = \
        $(top_builddir)/shell/librhythmbox-core.la      \
        $(GRILO_LIBS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/ipod/Makefile.am b/plugins/ipod/Makefile.am
index ef699da..eb6e925 100644
--- a/plugins/ipod/Makefile.am
+++ b/plugins/ipod/Makefile.am
@@ -19,7 +19,7 @@ libipod_la_LIBADD =                                   \
        $(top_builddir)/shell/librhythmbox-core.la      \
        $(IPOD_LIBS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/iradio/Makefile.am b/plugins/iradio/Makefile.am
index eaad432..6d9a385 100644
--- a/plugins/iradio/Makefile.am
+++ b/plugins/iradio/Makefile.am
@@ -20,7 +20,7 @@ libiradio_la_LIBADD =                                         \
        $(TOTEM_PLPARSER_LIBS)                          \
        $(NULL)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/lirc/Makefile.am b/plugins/lirc/Makefile.am
index a06bf2c..72de109 100644
--- a/plugins/lirc/Makefile.am
+++ b/plugins/lirc/Makefile.am
@@ -13,7 +13,7 @@ librblirc_la_LIBADD = $(top_builddir)/shell/librhythmbox-core.la
 configdir = $(plugindatadir)
 config_DATA = rhythmbox_lirc_default
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/mmkeys/Makefile.am b/plugins/mmkeys/Makefile.am
index e747857..444ac90 100644
--- a/plugins/mmkeys/Makefile.am
+++ b/plugins/mmkeys/Makefile.am
@@ -14,7 +14,7 @@ libmmkeys_la_LIBADD =                                 \
        $(top_builddir)/shell/librhythmbox-core.la      \
        $(NULL)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/mpris/Makefile.am b/plugins/mpris/Makefile.am
index 0789463..6ac65f8 100644
--- a/plugins/mpris/Makefile.am
+++ b/plugins/mpris/Makefile.am
@@ -15,7 +15,7 @@ libmpris_la_LIBADD =                                  \
        $(top_builddir)/shell/librhythmbox-core.la      \
        $(NULL)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/mtpdevice/Makefile.am b/plugins/mtpdevice/Makefile.am
index 7439032..a90c9f2 100644
--- a/plugins/mtpdevice/Makefile.am
+++ b/plugins/mtpdevice/Makefile.am
@@ -23,7 +23,7 @@ libmtpdevice_la_LIBADD =                              \
        $(HAL_LIBS)                                     \
        $(MTP_LIBS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/notification/Makefile.am b/plugins/notification/Makefile.am
index 7d4f603..c1e72cb 100644
--- a/plugins/notification/Makefile.am
+++ b/plugins/notification/Makefile.am
@@ -15,7 +15,7 @@ libnotification_la_LIBADD =                           \
        $(NOTIFY_LIBS)                                  \
        $(NULL)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/power-manager/Makefile.am b/plugins/power-manager/Makefile.am
index 8876500..11a3710 100644
--- a/plugins/power-manager/Makefile.am
+++ b/plugins/power-manager/Makefile.am
@@ -9,7 +9,7 @@ libpower_manager_la_LIBTOOLFLAGS = --tag=disable-static
 
 libpower_manager_la_LIBADD = $(top_builddir)/shell/librhythmbox-core.la
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am
index 70b22bc..554cae5 100644
--- a/plugins/visualizer/Makefile.am
+++ b/plugins/visualizer/Makefile.am
@@ -22,7 +22,7 @@ libvisualizer_la_LIBADD =                     \
        $(CLUTTER_LIBS)                                 \
        $(RHYTHMBOX_LIBS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/remote/dbus/Makefile.am b/remote/dbus/Makefile.am
index 77c0381..c90009c 100644
--- a/remote/dbus/Makefile.am
+++ b/remote/dbus/Makefile.am
@@ -5,7 +5,7 @@ rhythmbox_client_LDADD =                                \
        $(RB_CLIENT_LIBS)                               \
        $(DBUS_LIBS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/rhythmdb/Makefile.am b/rhythmdb/Makefile.am
index ec7b75d..6f5201f 100644
--- a/rhythmdb/Makefile.am
+++ b/rhythmdb/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = librhythmdb.la
 librhythmdb_la_LDFLAGS = -export-dynamic
 librhythmdb_la_LIBADD = -lm
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"RhythmDB\"                     \
        -I$(top_srcdir)                                 \
diff --git a/sample-plugins/sample-vala/Makefile.am b/sample-plugins/sample-vala/Makefile.am
index 1fd4720..4ab8238 100644
--- a/sample-plugins/sample-vala/Makefile.am
+++ b/sample-plugins/sample-vala/Makefile.am
@@ -11,7 +11,7 @@ libsample_vala_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 
 libsample_vala_la_CFLAGS = $(WNOERROR_CFLAGS)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
@@ -33,10 +33,10 @@ plugin_in_files = sample-vala.plugin.in
 
 %.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po); $(INTLTOOL_MERGE) $(top_srcdir)/po 
$< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-VALAFLAGS = --vapidir=$(top_srcdir)/bindings/vala --pkg=rhythmdb --pkg=rb --pkg=gstreamer-0.10 
--pkg=libpeas-1.0
+AM_VALAFLAGS = --vapidir=$(top_srcdir)/bindings/vala --pkg=rhythmdb --pkg=rb --pkg=gstreamer-0.10 
--pkg=libpeas-1.0
 
 %.c %.h: %.vala
-       $(VALAC) -C $(VALAFLAGS) $^
+       $(VALAC) -C $(AM_VALAFLAGS) $^
        
 plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
diff --git a/sample-plugins/sample/Makefile.am b/sample-plugins/sample/Makefile.am
index 67860dd..621796b 100644
--- a/sample-plugins/sample/Makefile.am
+++ b/sample-plugins/sample/Makefile.am
@@ -8,7 +8,7 @@ libsample_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 
 libsample_la_LIBADD = $(top_builddir)/shell/librhythmbox-core.la
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/shell/Makefile.am b/shell/Makefile.am
index c211201..123614b 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = rhythmbox
 rhythmbox_SOURCES = main.c
 lib_LTLIBRARIES = librhythmbox-core.la
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/sources/Makefile.am b/sources/Makefile.am
index 0405d58..862817a 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -52,7 +52,7 @@ libsources_la_SOURCES =               \
        rb-transfer-target.c            \
        $(NULL)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/sources/sync/Makefile.am b/sources/sync/Makefile.am
index bbfe562..7c1a0da 100644
--- a/sources/sync/Makefile.am
+++ b/sources/sync/Makefile.am
@@ -13,7 +13,7 @@ libsourcesync_la_SOURCES =            \
        rb-sync-state-ui.h              \
        $(NULL)
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d1d6064..0d1f267 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -47,7 +47,7 @@ test_widgets_SOURCES = \
 
 bench_rhythmdb_load_SOURCES = bench-rhythmdb-load.c
 
-INCLUDES =                                                     \
+AM_CPPFLAGS =                                                  \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"               \
        -DG_LOG_DOMAIN=\"Rhythmbox-tests\"                      \
        -I$(top_srcdir)                                         \
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index b55076e..65603a0 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -56,7 +56,7 @@ librbwidgets_la_SOURCES =                             \
        rb-button-bar.c                                 \
        rb-task-list-display.c
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
        -DG_LOG_DOMAIN=\"Rhythmbox\"                    \
        -I$(top_srcdir)                                 \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]