diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | mate-settings-daemon/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/datetime/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/media-keys/Makefile.am | 6 | ||||
| -rw-r--r-- | plugins/xrandr/Makefile.am | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index e3d3c89..3b73ec7 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,8 @@ AC_CONFIG_SRCDIR([mate-settings-daemon/mate-settings-manager.c]) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AC_STDC_HEADERS AC_PROG_CXX AM_PROG_CC_C_O @@ -348,9 +350,7 @@ AC_SUBST(NSS_DATABASE) # --------------------------------------------------------------------------- POLKIT_REQUIRED=0.91 -DBUS_GLIB_REQUIRED=0.71 DBUS_REQUIRED=1.1.2 -NETWORK_MANAGER_REQUIRED=0.6 # PolicyKit detection; defaults to 'auto' (use it if it's available) # diff --git a/data/Makefile.am b/data/Makefile.am index 975daf9..3ba2e7e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -35,7 +35,7 @@ service_in_files = org.mate.SettingsDaemon.service.in service_DATA = $(service_in_files:.service.in=.service) org.mate.SettingsDaemon.service: org.mate.SettingsDaemon.service.in Makefile - @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = mate-settings-daemon.pc diff --git a/mate-settings-daemon/Makefile.am b/mate-settings-daemon/Makefile.am index 6ba7d37..fcf4520 100644 --- a/mate-settings-daemon/Makefile.am +++ b/mate-settings-daemon/Makefile.am @@ -40,10 +40,10 @@ msd_PROGRAMS = \ mate-settings-daemon mate-settings-manager-glue.h: mate-settings-manager.xml Makefile.am - dbus-binding-tool --prefix=mate_settings_manager --mode=glib-server $< > $@ + $(AM_V_GEN) dbus-binding-tool --prefix=mate_settings_manager --mode=glib-server $< > $@ mate-settings-client.h: mate-settings-manager.xml Makefile.am - dbus-binding-tool --prefix=mate_settings_manager --mode=glib-client $< > $@ + $(AM_V_GEN) dbus-binding-tool --prefix=mate_settings_manager --mode=glib-client $< > $@ BUILT_SOURCES = \ mate-settings-manager-glue.h \ diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am index 061443f..7c3b76a 100644 --- a/plugins/datetime/Makefile.am +++ b/plugins/datetime/Makefile.am @@ -6,7 +6,7 @@ dbus_services_in_files = org.mate.SettingsDaemon.DateTimeMechanism.service.in polkit_in_files = org.mate.settingsdaemon.datetimemechanism.policy.in msd-datetime-mechanism-glue.h: $(srcdir)/msd-datetime-mechanism.xml - $(AM_V_GEN)dbus-binding-tool \ + $(AM_V_GEN) dbus-binding-tool \ --prefix=msd_datetime_mechanism --mode=glib-server \ --output=msd-datetime-mechanism-glue.h \ $(srcdir)/msd-datetime-mechanism.xml diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am index 9bd9553..d0a7b6a 100644 --- a/plugins/media-keys/Makefile.am +++ b/plugins/media-keys/Makefile.am @@ -56,15 +56,15 @@ uninstall-local: rm -f $(DESTDIR)$(icondir)/scalable/$(context)/touchpad-disabled.svg msd-media-keys-manager-glue.h: msd-media-keys-manager.xml Makefile - dbus-binding-tool --prefix=msd_media_keys_manager --mode=glib-server $< > xgen-$(@F) \ + $(AM_V_GEN) dbus-binding-tool --prefix=msd_media_keys_manager --mode=glib-server $< > xgen-$(@F) \ && ( cmp -s xgen-$(@F) $@ || cp xgen-$(@F) $@ ) \ && rm -f xgen-$(@F) msd-marshal.c: msd-marshal.list - $(GLIB_GENMARSHAL) --prefix=msd_marshal $< --header --body --internal > $@ + $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=msd_marshal $< --header --body --internal > $@ msd-marshal.h: msd-marshal.list - $(GLIB_GENMARSHAL) --prefix=msd_marshal $< --header --internal > $@ + $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=msd_marshal $< --header --internal > $@ libmedia_keys_la_SOURCES = \ msd-media-keys-plugin.h \ diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am index 6bdfaae..b4afb93 100644 --- a/plugins/xrandr/Makefile.am +++ b/plugins/xrandr/Makefile.am @@ -35,7 +35,7 @@ plugin_LTLIBRARIES = \ libxrandr.la msd-xrandr-manager-glue.h: msd-xrandr-manager.xml Makefile - dbus-binding-tool --prefix=msd_xrandr_manager --mode=glib-server $< > xgen-$(@F) \ + $(AM_V_GEN) dbus-binding-tool --prefix=msd_xrandr_manager --mode=glib-server $< > xgen-$(@F) \ && ( cmp -s xgen-$(@F) $@ || cp xgen-$(@F) $@ ) \ && rm -f xgen-$(@F) |