[Xfce4-commits] <xfce4-session:master> Fix distcheck.

[Nick Schermer]

Updating branch refs/heads/master
         to 365a90ef6a54dedb1c686b8a9eb0b21191a05ccd (commit)
       from eaac4c7055e9ff0c1cd6e51359e8add0cd924f1b (commit)

commit 365a90ef6a54dedb1c686b8a9eb0b21191a05ccd
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Mar 24 22:45:14 2012 +0100

    Fix distcheck.

 po/POTFILES.in            |    5 +++--
 xfce4-session/Makefile.am |   12 ++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c9bd543..d9c62a5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,16 +13,17 @@ settings/xfae-dialog.c
 settings/xfae-model.c
 settings/xfae-window.c
 xfce4-session/main.c
-xfce4-session/shutdown.c
 xfce4-session/xfsm-chooser.c
 xfce4-session/xfsm-client.c
 xfce4-session/xfsm-compat-gnome.c
 xfce4-session/xfsm-compat-kde.c
 xfce4-session/xfsm-dns.c
 xfce4-session/xfsm-manager.c
-xfce4-session/xfsm-shutdown-helper.c
+xfce4-session/xfsm-logout-dialog.c
 xfce4-session/xfsm-splash-screen.c
 xfce4-session/xfsm-startup.c
+xfce4-session/xfsm-shutdown.c
+xfce4-session/xfsm-upower.c
 xfce4-session-logout/main.c
 xfce4-session-logout/xfce4-session-logout.desktop.in
 
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index ff42d1c..5e8343a 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -1,6 +1,7 @@
 
 INCLUDES =								\
 	-I$(top_builddir)						\
+	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"xfce4-session\"				\
 	-DLIBDIR=\"$(libdir)\"						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
@@ -74,12 +75,7 @@ xfce4_session_CFLAGS =							\
 	$(LIBWNCK_CFLAGS)						\
 	$(XFCONF_CFLAGS)						\
 	$(GMODULE_CFLAGS)						\
-	-DDBUS_API_SUBJECT_TO_CHANGE					\
-	-DWNCK_I_KNOW_THIS_IS_UNSTABLE					\
-	-DLIBDIR=\"$(libdir)\"						\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
-	-DSYSCONFDIR=\"$(sysconfdir)\"					\
-	-DXFSM_SHUTDOWN_HELPER_CMD=\"$(HELPER_PATH_PREFIX)/xfce4/session/xfsm-shutdown-helper\"
+	$(PLATFORM_CFLAGS)
 
 xfce4_session_LDFLAGS =							\
 	-no-undefined							\
@@ -108,10 +104,10 @@ if MAINTAINER_MODE
 xfsm-chooser-icon.h: $(srcdir)/xfsm-chooser-icon.png
 	$(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=xfsm_chooser_icon_data $< > $@
 
-xfsm-marshal.h: xfsm-marshal.list Makefile
+xfsm-marshal.h: $(srcdir)/xfsm-marshal.list Makefile
 	$(AM_V_GEN) glib-genmarshal --prefix=xfsm_marshal --internal --header $< > $@
 
-xfsm-marshal.c: xfsm-marshal.list Makefile
+xfsm-marshal.c: $(srcdir)/xfsm-marshal.list Makefile
 	$(AM_V_GEN) echo "#include <xfce4-session/xfsm-marshal.h>" > $@ \
 	&& glib-genmarshal --prefix=xfsm_marshal --body $< >> $@