diff options
| author | Stefano Karapetsas <[email protected]> | 2013-11-08 18:46:33 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-11-08 18:46:33 -0800 |
| commit | 622ff703158394e73f6dae8377b1f6d3f26f79e3 (patch) | |
| tree | a80168b2ca4dc8546c195581ec3144f8f3fc514f | |
| parent | b4d8c8eba2352420d59787076a79a138e06145d3 (diff) | |
| parent | f25ab14084285273868b9e83e5b0065a59e724d7 (diff) | |
| download | mate-settings-daemon-622ff703158394e73f6dae8377b1f6d3f26f79e3.tar.bz2 mate-settings-daemon-622ff703158394e73f6dae8377b1f6d3f26f79e3.tar.xz | |
Merge pull request #54 from infirit/1.6
Fixes and cleanups
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | mate-settings-daemon/Makefile.am | 3 | ||||
| -rw-r--r-- | plugins/media-keys/cut-n-paste/Makefile.am | 6 |
4 files changed, 22 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 14617a5..2d42695 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ NULL = +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + SUBDIRS = \ mate-settings-daemon \ plugins \ @@ -14,3 +16,17 @@ EXTRA_DIST = \ DISTCLEANFILES = \ $(NULL) + +dist-hook: + @if test -d "$(srcdir)/.git"; \ + then \ + echo Creating ChangeLog && \ + (GIT_DIR=$(top_srcdir)/.git \ + ./missing --run git log --stat -M -C --name-status --date=short --no-color) | \ + fmt --split-only > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || ( rm -f ChangeLog.tmp ; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo A git clone is required to generate a ChangeLog >&2; \ + fi diff --git a/configure.ac b/configure.ac index 9547dbc..64745c9 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,7 @@ AC_INIT([mate-settings-daemon], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR([mate-settings-daemon/mate-settings-manager.c]) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar]) diff --git a/mate-settings-daemon/Makefile.am b/mate-settings-daemon/Makefile.am index 778cb92..7fb6fdc 100644 --- a/mate-settings-daemon/Makefile.am +++ b/mate-settings-daemon/Makefile.am @@ -1,6 +1,6 @@ NULL = -INCLUDES = \ +AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ @@ -21,6 +21,7 @@ libmsd_profile_la_SOURCES = \ $(NULL) libmsd_profile_la_CPPFLAGS = \ + $(AM_CPPFLAGS) $(DISABLE_DEPRECATED_CFLAGS) \ $(NULL) diff --git a/plugins/media-keys/cut-n-paste/Makefile.am b/plugins/media-keys/cut-n-paste/Makefile.am index 28a9f77..f5707da 100644 --- a/plugins/media-keys/cut-n-paste/Makefile.am +++ b/plugins/media-keys/cut-n-paste/Makefile.am @@ -2,7 +2,7 @@ NULL = noinst_LTLIBRARIES = libgvc.la -INCLUDES = \ +AM_CPPFLAGS = \ $(WARN_CFLAGS) \ $(NULL) @@ -13,7 +13,7 @@ libgvc_la_SOURCES = \ $(NULL) if HAVE_PULSE -INCLUDES += \ +AM_CPPFLAGS += \ $(VOLUME_CONTROL_CFLAGS) \ $(PULSE_CFLAGS) @@ -43,7 +43,7 @@ libgvc_la_SOURCES += \ endif if HAVE_GSTREAMER -INCLUDES += \ +AM_CPPFLAGS += \ $(SETTINGS_PLUGIN_CFLAGS) \ $(AM_CFLAGS) \ $(GST_CFLAGS) |