s/INCLUDES/AM_CPPFLAGS/ and some other stuff

MFAshby · Dec 29, 2014 · 8144441 · 8144441
1 parent f624b41
commit 8144441
Show file tree

Hide file tree

Showing 33 changed files with 40 additions and 39 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) 				\