diff options
| author | Benedikt Meurer <benny@xfce.org> | 2006-09-08 23:39:43 +0000 |
|---|---|---|
| committer | Benedikt Meurer <benny@xfce.org> | 2006-09-08 23:39:43 +0000 |
| commit | d3af6697b0ee185b8e0cf5e91c5dfe484227abdf (patch) | |
| tree | 5a0e3306b6ba7650ceceef0ffe8156dd394a0bb5 /xfce4-session/Makefile.am | |
| parent | eb70a6188a09b5aaaff05fa4a5899bc89378d423 (diff) | |
| download | xfce4-session-d3af6697b0ee185b8e0cf5e91c5dfe484227abdf.tar.gz | |
2006-09-09 Benedikt Meurer <benny@xfce.org>
* README, configure.in.in, xfce4-session/: Merge the sudo and the HAL
shutdown helpers into a single shutdown helper, which tries to use
HAL first, and falls back to sudo.
(Old svn revision: 23113)
Diffstat (limited to 'xfce4-session/Makefile.am')
| -rw-r--r-- | xfce4-session/Makefile.am | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am index 2cfe604f..bb4cee8e 100644 --- a/xfce4-session/Makefile.am +++ b/xfce4-session/Makefile.am @@ -1,4 +1,7 @@ +# $Id$ + INCLUDES = \ + -I$(top_builddir) \ -I$(top_srcdir) man_MANS = xfce4-session.1 @@ -42,12 +45,12 @@ xfce4_session_SOURCES = \ xfsm-startup.h xfce4_session_CFLAGS = \ - @GNOME_CFLAGS@ \ - @LIBSM_CFLAGS@ \ - @LIBX11_CFLAGS@ \ - @LIBXFCE4MCS_CLIENT_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ - @DBUS_CFLAGS@ \ + $(GNOME_CFLAGS) \ + $(LIBSM_CFLAGS) \ + $(LIBX11_CFLAGS) \ + $(LIBXFCE4MCS_CLIENT_CFLAGS) \ + $(LIBXFCEGUI4_CFLAGS) \ + $(DBUS_CFLAGS) \ -DDBUS_API_SUBJECT_TO_CHANGE \ -DLIBDIR=\"$(libdir)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @@ -56,14 +59,14 @@ xfce4_session_CFLAGS = \ xfce4_session_LDADD = \ $(top_builddir)/libxfsm/libxfsm-4.2.la \ - @LIBSM_LDFLAGS@ \ - @LIBSM_LIBS@ \ - @LIBX11_LDFLAGS@ \ - @LIBX11_LIBS@ \ - @LIBXFCE4MCS_CLIENT_LIBS@ \ - @LIBXFCEGUI4_LIBS@ \ - @DBUS_LIBS@ \ - @GNOME_LIBS@ + $(LIBSM_LDFLAGS) \ + $(LIBSM_LIBS) \ + $(LIBX11_LDFLAGS) \ + $(LIBX11_LIBS) \ + $(LIBXFCE4MCS_CLIENT_LIBS) \ + $(LIBXFCEGUI4_LIBS) \ + $(DBUS_LIBS) \ + $(GNOME_LIBS) xfce4_session_DEPENDENCIES = \ $(top_builddir)/libxfsm/libxfsm-4.2.la @@ -75,9 +78,5 @@ chooser-icon.h: $(srcdir)/chooser-icon.png EXTRA_DIST = \ $(man_MANS) \ - chooser-icon.png \ - xfsm-shutdown-helper-none.c \ - xfsm-shutdown-helper-redhat.c \ - xfsm-shutdown-helper-hal.c \ - xfsm-shutdown-helper-sudo.c + chooser-icon.png |