[Xfce4-commits] <xfce4-panel:xfce-4.10> Autotools updates.
Nick Schermer
noreply at xfce.org
Sun May 5 17:50:08 CEST 2013
Updating branch refs/heads/xfce-4.10
to 4294d606bdd87b94ab6ebc22b9ea2d1c92dd2e45 (commit)
from 217e17d630271b1bf5ab6fa5300a33b884faddea (commit)
commit 4294d606bdd87b94ab6ebc22b9ea2d1c92dd2e45
Author: Nick Schermer <nick at xfce.org>
Date: Sun Jan 6 12:20:16 2013 +0100
Autotools updates.
(cherry picked from commit d4c4c5a745db93acb341879ec18adcc795df8507)
common/Makefile.am | 2 +-
configure.ac.in | 2 +-
docs/references/Makefile.am | 2 +-
libxfce4panel/Makefile.am | 2 +-
migrate/Makefile.am | 2 +-
panel/Makefile.am | 2 +-
plugins/actions/Makefile.am | 2 +-
plugins/applicationsmenu/Makefile.am | 2 +-
plugins/clock/Makefile.am | 2 +-
plugins/directorymenu/Makefile.am | 2 +-
plugins/launcher/Makefile.am | 2 +-
plugins/pager/Makefile.am | 2 +-
plugins/separator/Makefile.am | 2 +-
plugins/showdesktop/Makefile.am | 2 +-
plugins/systray/Makefile.am | 2 +-
plugins/tasklist/Makefile.am | 2 +-
plugins/windowmenu/Makefile.am | 2 +-
wrapper/Makefile.am | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/common/Makefile.am b/common/Makefile.am
index 18fecf3..dd2d971 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libpanel-common\" \
-DLIBXFCE4PANEL_COMPILATION \
diff --git a/configure.ac.in b/configure.ac.in
index 6b3f4db..80d909e 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -39,7 +39,7 @@ AC_REVISION([xfce4_panel_version_build])
dnl ***************************
dnl *** Initialize automake ***
dnl ***************************
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar])
AM_MAINTAINER_MODE()
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/docs/references/Makefile.am b/docs/references/Makefile.am
index 8db2c09..e760d3f 100644
--- a/docs/references/Makefile.am
+++ b/docs/references/Makefile.am
@@ -43,7 +43,7 @@ content_files = \
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GTK_CFLAGS) \
diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am
index 29c3f8b..cba5083 100644
--- a/libxfce4panel/Makefile.am
+++ b/libxfce4panel/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libxfce4panel\" \
-DLIBXFCE4PANEL_COMPILATION \
diff --git a/migrate/Makefile.am b/migrate/Makefile.am
index d0e695b..9cb9d2c 100644
--- a/migrate/Makefile.am
+++ b/migrate/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"xfce4-panel-migrate\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
diff --git a/panel/Makefile.am b/panel/Makefile.am
index 672272b..a19453d 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"xfce4-panel\" \
-DDATADIR=\"$(datadir)/xfce4\" \
diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index ddad990..b649215 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libactions\" \
$(PLATFORM_CPPFLAGS)
diff --git a/plugins/applicationsmenu/Makefile.am b/plugins/applicationsmenu/Makefile.am
index 0689247..d0d94bf 100644
--- a/plugins/applicationsmenu/Makefile.am
+++ b/plugins/applicationsmenu/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libapplicationsmenu\" \
$(PLATFORM_CPPFLAGS)
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index 923fb33..1878115 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libclock\" \
$(PLATFORM_CPPFLAGS)
diff --git a/plugins/directorymenu/Makefile.am b/plugins/directorymenu/Makefile.am
index 0aa46b8..88b13ea 100644
--- a/plugins/directorymenu/Makefile.am
+++ b/plugins/directorymenu/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libdirectorymenu\" \
$(PLATFORM_CPPFLAGS)
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index e7029db..5841dc7 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"liblauncher\" \
-DSN_API_NOT_YET_FROZEN \
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index ceb1ea7..7730391 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libpager\" \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index 1312aab..77b6449 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libseparator\" \
$(PLATFORM_CPPFLAGS)
diff --git a/plugins/showdesktop/Makefile.am b/plugins/showdesktop/Makefile.am
index 37c6f74..6180434 100644
--- a/plugins/showdesktop/Makefile.am
+++ b/plugins/showdesktop/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libshowdesktop\" \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index 01db738..8c8c948 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libsystray\" \
$(PLATFORM_CPPFLAGS)
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index 4d9c593..4f386f3 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libtasklist\" \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 88f7bf2..a183683 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libwindowmenu\" \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 3981587..94bb13a 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"xfce4-panel-wrapper\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
More information about the Xfce4-commits
mailing list