summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-06-02 10:25:28 -0700
committerStefano Karapetsas <[email protected]>2013-06-02 10:25:28 -0700
commit32a2bc051959798d978e6967bd34ff8882aada39 (patch)
tree11963c0896c396922aeddb2cf1d7c1b7fb34d7f6
parent38f14561ec526b8efebec5fd6db33979b6eefc49 (diff)
parent34cee4ade566c148f76d6dd0157ea442b4c9e01a (diff)
downloadmate-applets-32a2bc051959798d978e6967bd34ff8882aada39.tar.bz2
mate-applets-32a2bc051959798d978e6967bd34ff8882aada39.tar.xz
Merge pull request #48 from NiceandGently/master
fix some make files for automake-1.13
-rw-r--r--battstat/apmlib/Makefile.am2
-rw-r--r--cpufreq/src/Makefile.am2
-rw-r--r--cpufreq/src/cpufreq-selector/Makefile.am4
-rw-r--r--trashapplet/src/Makefile.am2
4 files changed, 5 insertions, 5 deletions
diff --git a/battstat/apmlib/Makefile.am b/battstat/apmlib/Makefile.am
index ed10b6d7..f9fe099e 100644
--- a/battstat/apmlib/Makefile.am
+++ b/battstat/apmlib/Makefile.am
@@ -4,7 +4,7 @@
# Created: Thu Jun 15 23:08:41 CEST 2000
#
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/apmlib \
$(MATE_APPLETS_CFLAGS) \
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 3f4162a9..a30d3513 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -4,7 +4,7 @@ endif
SUBDIRS = $(selector_SUBDIR)
-INCLUDES = \
+AM_CPPFLAGS = \
-DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\" \
$(MATE_APPLETS4_CFLAGS) \
$(LIBGLADE_CFLAGS) \
diff --git a/cpufreq/src/cpufreq-selector/Makefile.am b/cpufreq/src/cpufreq-selector/Makefile.am
index ea660c43..27dfac69 100644
--- a/cpufreq/src/cpufreq-selector/Makefile.am
+++ b/cpufreq/src/cpufreq-selector/Makefile.am
@@ -1,9 +1,9 @@
cpufreqselectordir = $(bindir)
-INCLUDES = $(CPUFREQ_SELECTOR_CFLAGS)
+AM_CPPFLAGS = $(CPUFREQ_SELECTOR_CFLAGS)
if HAVE_POLKIT
-INCLUDES += \
+AM_CPPFLAGS += \
$(DBUS_CFLAGS) \
$(POLKIT_CFLAGS)
endif
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index 36a536ce..6e34f837 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) \
+AM_CPPFLAGS = -I$(top_srcdir) \
$(MATE_APPLETS4_CFLAGS) \
$(GIO_CFLAGS) \
-DTRASH_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\"