From 24296767098190f1404d889aa910a03fcbc70c62 Mon Sep 17 00:00:00 2001 From: Dan Mashal Date: Sun, 21 Apr 2013 04:20:51 -0700 Subject: Update makefiles for automake 1.13 --- savers/Makefile.am | 4 ++-- src/Makefile.am | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/savers/Makefile.am b/savers/Makefile.am index 298177e..ca80757 100644 --- a/savers/Makefile.am +++ b/savers/Makefile.am @@ -3,13 +3,13 @@ AUTOMAKE_OPTIONS = 1.7 NULL = -INCLUDES = \ +AM_CPPFLAGS = \ -I. \ -I$(srcdir) \ $(MATE_SCREENSAVER_SAVER_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ -DLIBEXECDIR=\""$(libexecdir)"\" \ - -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ -DDATADIR=\""$(datadir)"\" \ $(WARN_CFLAGS) \ $(NULL) diff --git a/src/Makefile.am b/src/Makefile.am index 60aa6ea..298382d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,24 +6,24 @@ NULL = saverdir = $(libexecdir)/mate-screensaver themesdir = $(pkgdatadir)/themes -INCLUDES = \ +AM_CPPFLAGS = \ -I. \ -I$(srcdir) \ - -DMATEMENU_I_KNOW_THIS_IS_UNSTABLE \ + -DMATEMENU_I_KNOW_THIS_IS_UNSTABLE \ $(MATE_SCREENSAVER_CFLAGS) \ $(MATE_SCREENSAVER_DIALOG_CFLAGS) \ $(MATE_SCREENSAVER_CAPPLET_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ - -DPREFIX=\""$(prefix)"\" \ + -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ - -DLIBDIR=\""$(libdir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ -DSAVERDIR=\""$(saverdir)"\" \ -DTHEMESDIR=\""$(themesdir)"\" \ - -DGTKBUILDERDIR=\"$(pkgdatadir)\" \ + -DGTKBUILDERDIR=\"$(pkgdatadir)\" \ -DPAM_SERVICE_NAME=\""mate-screensaver"\" \ $(WARN_CFLAGS) \ $(AUTH_CFLAGS) \ -- cgit v1.2.1