[Xfce4-commits] [apps/xfce4-screensaver] 01/01: More consistent spacing in makefiles
noreply at xfce.org
noreply at xfce.org
Sat Jun 8 15:09:49 CEST 2019
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screensaver.
commit 9b1fa9269029dab7a2daeb9bfc6eb88135553379
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sat Jun 8 09:09:35 2019 -0400
More consistent spacing in makefiles
---
Makefile.am | 90 +++++-----
NEWS | 1 +
data/Makefile.am | 114 ++++++------
data/images/Makefile.am | 10 +-
doc/Makefile.am | 14 +-
savers/Makefile.am | 146 ++++++++--------
src/Makefile.am | 456 ++++++++++++++++++++++++------------------------
7 files changed, 416 insertions(+), 415 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 94f4989..e496f12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,63 +6,63 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
NULL =
DISTCHECK_CONFIGURE_FLAGS = \
- --without-elogind \
+ --without-elogind \
--without-systemd
-SUBDIRS = \
- src \
- savers \
- po \
- data \
- doc \
+SUBDIRS = \
+ src \
+ savers \
+ po \
+ data \
+ doc \
$(NULL)
-EXTRA_DIST = \
- autogen.sh \
- COPYING \
- COPYING.LIB \
- COPYING.LGPL \
- AUTHORS \
- INSTALL \
- README.md \
- ChangeLog \
- NEWS \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
+EXTRA_DIST = \
+ autogen.sh \
+ COPYING \
+ COPYING.LIB \
+ COPYING.LGPL \
+ AUTHORS \
+ INSTALL \
+ README.md \
+ ChangeLog \
+ NEWS \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
$(NULL)
-DISTCLEANFILES = \
- intltool-extract \
- intltool-merge \
- intltool-update \
- ./po/.intltool-merge-cache \
+DISTCLEANFILES = \
+ intltool-extract \
+ intltool-merge \
+ intltool-update \
+ ./po/.intltool-merge-cache \
$(NULL)
-MAINTAINERCLEANFILES = \
- *~ \
- intltool-*.in \
- compile \
- configure \
- INSTALL \
- COPYING \
- install-sh \
- missing \
- mkinstalldirs \
- config.guess \
- ltmain.sh \
- config.sub \
- depcomp \
- Makefile.in \
- config.h.* \
- aclocal.m4 \
- acinclude.m4 \
+MAINTAINERCLEANFILES = \
+ *~ \
+ intltool-*.in \
+ compile \
+ configure \
+ INSTALL \
+ COPYING \
+ install-sh \
+ missing \
+ mkinstalldirs \
+ config.guess \
+ ltmain.sh \
+ config.sub \
+ depcomp \
+ Makefile.in \
+ config.h.* \
+ aclocal.m4 \
+ acinclude.m4 \
$(NULL)
# Build ChangeLog from GIT history
ChangeLog:
- $(AM_V_GEN) if test -d $(top_srcdir)/.git; then \
- GIT_DIR="$(top_srcdir)/.git" git log --stat > $@; \
+ $(AM_V_GEN) if test -d $(top_srcdir)/.git; then \
+ GIT_DIR="$(top_srcdir)/.git" git log --stat > $@; \
fi
dist: ChangeLog
diff --git a/NEWS b/NEWS
index 74c5143..41d5833 100644
--- a/NEWS
+++ b/NEWS
@@ -89,6 +89,7 @@
- UI files are now compiled and included in the binaries
- Root warning is now an InfoBar to make it more visible
- Enabled embedding in the Xfce Settings Manager
+ - More consistent spacing in makefiles
- Bug Fixes:
- Fix crash with no background placement, fix color settings (Xfce #14769)
- Redraw the screensaver on monitor configuration events (Xfce #14796)
diff --git a/data/Makefile.am b/data/Makefile.am
index 869a0cf..3a64fd3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,12 +1,12 @@
-SUBDIRS = \
+SUBDIRS = \
images
NULL =
-man_MANS = \
- xfce4-screensaver.1 \
- xfce4-screensaver-command.1 \
- xfce4-screensaver-preferences.1 \
+man_MANS = \
+ xfce4-screensaver.1 \
+ xfce4-screensaver-command.1 \
+ xfce4-screensaver-preferences.1 \
$(NULL)
@INTLTOOL_DESKTOP_RULE@
@@ -18,14 +18,14 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DIRECTORY_RULE@
directorydir = $(datadir)/desktop-directories
-directory_in_files = \
- xfce4-screensaver.directory.in \
+directory_in_files = \
+ xfce4-screensaver.directory.in \
$(NULL)
directory_DATA = $(directory_in_files:.directory.in=.directory)
menudir = $(sysconfdir)/xdg/menus
-menu_DATA = \
- xfce4-screensavers.menu \
+menu_DATA = \
+ xfce4-screensavers.menu \
$(NULL)
pkgconfigdir = $(libdir)/pkgconfig
@@ -36,59 +36,59 @@ dbussessionservice_DATA = org.xfce.ScreenSaver.service
@INTLTOOL_XML_NOMERGE_RULE@
-EXTRA_DIST = \
- $(desktop_in_files) \
- $(directory_in_files) \
- $(man_MANS) \
- xfce4-screensaver.common-auth \
- xfce4-screensaver.system-auth \
- xfce4-screensaver.pc.in \
- org.xfce.ScreenSaver.service.in\
- xscreensaver-config.xsl \
- migrate-xscreensaver-config.sh \
+EXTRA_DIST = \
+ $(desktop_in_files) \
+ $(directory_in_files) \
+ $(man_MANS) \
+ xfce4-screensaver.common-auth \
+ xfce4-screensaver.system-auth \
+ xfce4-screensaver.pc.in \
+ org.xfce.ScreenSaver.service.in \
+ xscreensaver-config.xsl \
+ migrate-xscreensaver-config.sh \
$(NULL)
-DISTCLEANFILES = \
- $(desktop_DATA) \
- $(directory_DATA) \
+DISTCLEANFILES = \
+ $(desktop_DATA) \
+ $(directory_DATA) \
$(NULL)
-MAINTAINERCLEANFILES = \
- *~ \
+MAINTAINERCLEANFILES = \
+ *~ \
Makefile.in
install-data-hook:
- @system=`uname`; \
- if test -f /usr/include/security/pam_appl.h; then \
- if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
- $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
- chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
- fi; \
- if test $$system = Linux; then \
- if test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/xfce4-screensaver; then \
- if test "x$(PAM_AUTH_TYPE)" = "xsystem"; then \
- $(INSTALL_DATA) xfce4-screensaver.system-auth $(DESTDIR)$(PAM_PREFIX)/pam.d/xfce4-screensaver; \
- else \
- $(INSTALL_DATA) xfce4-screensaver.common-auth $(DESTDIR)$(PAM_PREFIX)/pam.d/xfce4-screensaver; \
- fi; \
- fi; \
- if test "x$(PAM_PREFIX)" != "x/etc/pam.d"; then \
- echo "***" ; \
- echo "*** Warning: xfce4-screensaver has been compiled with support for" ; \
- echo "*** Pluggable Authentication Modules (PAM). However, you may need to" ; \
- echo "*** manually install $(PAM_PREFIX)/pam.d/xfce4-screensaver" ; \
- echo "*** to /etc/pam.d/xfce4-screensaver. Otherwise, unlocking might" ; \
- echo "*** not work." ; \
- echo "***" ; \
- fi; \
- fi; \
- if test $$system = SunOS; then \
- echo "***" ; \
- echo "*** Warning: xfce4-screensaver has been compiled with support for" ; \
- echo "*** Pluggable Authentication Modules (PAM). However, you" ; \
- echo "*** need to manually add authentication for xfce4-screensaver in" ; \
- echo "*** $(PAM_PREFIX)/pam.conf or /etc/pam.conf." ; \
- echo "*** Otherwise, unlocking might not work." ; \
- echo "***" ; \
- fi; \
+ @system=`uname`; \
+ if test -f /usr/include/security/pam_appl.h; then \
+ if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
+ $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
+ chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
+ fi; \
+ if test $$system = Linux; then \
+ if test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/xfce4-screensaver; then \
+ if test "x$(PAM_AUTH_TYPE)" = "xsystem"; then \
+ $(INSTALL_DATA) xfce4-screensaver.system-auth $(DESTDIR)$(PAM_PREFIX)/pam.d/xfce4-screensaver; \
+ else \
+ $(INSTALL_DATA) xfce4-screensaver.common-auth $(DESTDIR)$(PAM_PREFIX)/pam.d/xfce4-screensaver; \
+ fi; \
+ fi; \
+ if test "x$(PAM_PREFIX)" != "x/etc/pam.d"; then \
+ echo "***" ; \
+ echo "*** Warning: xfce4-screensaver has been compiled with support for" ; \
+ echo "*** Pluggable Authentication Modules (PAM). However, you may need to" ; \
+ echo "*** manually install $(PAM_PREFIX)/pam.d/xfce4-screensaver" ; \
+ echo "*** to /etc/pam.d/xfce4-screensaver. Otherwise, unlocking might" ; \
+ echo "*** not work." ; \
+ echo "***" ; \
+ fi; \
+ fi; \
+ if test $$system = SunOS; then \
+ echo "***" ; \
+ echo "*** Warning: xfce4-screensaver has been compiled with support for" ; \
+ echo "*** Pluggable Authentication Modules (PAM). However, you" ; \
+ echo "*** need to manually add authentication for xfce4-screensaver in" ; \
+ echo "*** $(PAM_PREFIX)/pam.conf or /etc/pam.conf." ; \
+ echo "*** Otherwise, unlocking might not work." ; \
+ echo "***" ; \
+ fi; \
fi
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index ddb1fd9..8adefbc 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -1,13 +1,13 @@
NULL =
-SUBDIRS = \
+SUBDIRS = \
$(NULL)
imagedir = $(datadir)/pixmaps
-image_DATA = \
- xfce-logo-white.svg \
+image_DATA = \
+ xfce-logo-white.svg \
$(NULL)
-EXTRA_DIST = \
- $(image_DATA) \
+EXTRA_DIST = \
+ $(image_DATA) \
$(NULL)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d374246..6560c13 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,8 @@
NULL =
-SPEC_XML_FILES = \
- xfce4-screensaver.xml \
- dbus-interface.xml \
+SPEC_XML_FILES = \
+ xfce4-screensaver.xml \
+ dbus-interface.xml \
$(NULL)
if DOCBOOK_DOCS_ENABLED
@@ -15,10 +15,10 @@ xfce4-screensaver.html : dbus-interface.xml
endif # DOCBOOK_DOCS_ENABLED
-EXTRA_DIST = \
- xfce4-screensaver.xml.in \
- config.xsl \
- docbook.css \
+EXTRA_DIST = \
+ xfce4-screensaver.xml.in \
+ config.xsl \
+ docbook.css \
$(SPEC_XML_FILES)
$(NULL)
diff --git a/savers/Makefile.am b/savers/Makefile.am
index 294bb17..68a7fb9 100644
--- a/savers/Makefile.am
+++ b/savers/Makefile.am
@@ -3,21 +3,21 @@ AUTOMAKE_OPTIONS = 1.7
NULL =
-AM_CPPFLAGS = \
- -I. \
- -I$(srcdir) \
- $(XFCE_SCREENSAVER_SAVER_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
- -DXFCELOCALEDIR=\""$(datadir)/locale"\" \
- -DDATADIR=\""$(datadir)"\" \
- $(WARN_CFLAGS) \
+AM_CPPFLAGS = \
+ -I. \
+ -I$(srcdir) \
+ $(XFCE_SCREENSAVER_SAVER_CFLAGS) \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
+ -DXFCELOCALEDIR=\""$(datadir)/locale"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ $(WARN_CFLAGS) \
$(NULL)
-DESKTOP_IN_IN_FILES = \
- xfce-floaters.desktop.in.in \
- xfce-personal-slideshow.desktop.in.in \
- xfce-popsquares.desktop.in.in \
+DESKTOP_IN_IN_FILES = \
+ xfce-floaters.desktop.in.in \
+ xfce-personal-slideshow.desktop.in.in \
+ xfce-popsquares.desktop.in.in \
$(NULL)
xfce-floaters.desktop.in: xfce-floaters.desktop.in.in Makefile
@@ -30,20 +30,20 @@ xfce-popsquares.desktop.in: xfce-popsquares.desktop.in.in Makefile
@INTLTOOL_DESKTOP_RULE@
edit = sed \
- -e 's|@FLOATERS_XFCE_IMAGE[@]|$(FLOATERS_XFCE_IMAGE)|g' \
+ -e 's|@FLOATERS_XFCE_IMAGE[@]|$(FLOATERS_XFCE_IMAGE)|g' \
-e 's|@SAVERDIR[@]|$(privlibexecdir)|g'
themesdir = $(datadir)/applications/screensavers
-themes_in_files = \
- xfce-floaters.desktop.in \
- xfce-personal-slideshow.desktop.in \
- xfce-popsquares.desktop.in \
+themes_in_files = \
+ xfce-floaters.desktop.in \
+ xfce-personal-slideshow.desktop.in \
+ xfce-popsquares.desktop.in \
$(NULL)
themes_DATA = $(themes_in_files:.desktop.in=.desktop)
-BUILT_SOURCES = \
- gs-theme-engine-marshal.c \
- gs-theme-engine-marshal.h \
+BUILT_SOURCES = \
+ gs-theme-engine-marshal.c \
+ gs-theme-engine-marshal.h \
$(NULL)
gs-theme-engine-marshal.c: gs-theme-engine-marshal.list
@@ -53,84 +53,84 @@ gs-theme-engine-marshal.c: gs-theme-engine-marshal.list
gs-theme-engine-marshal.h: gs-theme-engine-marshal.list
@GLIB_GENMARSHAL@ $< --prefix=gs_theme_engine_marshal --header > $@
-noinst_LIBRARIES = \
+noinst_LIBRARIES = \
libgs-theme-engine.a
-libgs_theme_engine_a_CPPFLAGS = \
- $(XFCE_SCREENSAVER_SAVER_CFLAGS) \
- -DDATADIR=\""$(datadir)"\" \
+libgs_theme_engine_a_CPPFLAGS = \
+ $(XFCE_SCREENSAVER_SAVER_CFLAGS) \
+ -DDATADIR=\""$(datadir)"\" \
$(NULL)
-libgs_theme_engine_a_SOURCES = \
- $(BUILT_SOURCES) \
- gs-theme-window.h \
- gs-theme-window.c \
- gs-theme-engine.c \
- gs-theme-engine.h \
+libgs_theme_engine_a_SOURCES = \
+ $(BUILT_SOURCES) \
+ gs-theme-window.h \
+ gs-theme-window.c \
+ gs-theme-engine.c \
+ gs-theme-engine.h \
$(NULL)
saverdir = $(libexecdir)/xfce4-screensaver
-saver_PROGRAMS = \
- floaters \
- popsquares \
- slideshow \
+saver_PROGRAMS = \
+ floaters \
+ popsquares \
+ slideshow \
$(NULL)
-floaters_SOURCES = \
- floaters.c \
+floaters_SOURCES = \
+ floaters.c \
$(NULL)
-floaters_LDADD = \
- libgs-theme-engine.a \
- $(XFCE_SCREENSAVER_SAVER_LIBS) \
+floaters_LDADD = \
+ libgs-theme-engine.a \
+ $(XFCE_SCREENSAVER_SAVER_LIBS) \
-lm \
$(NULL)
-popsquares_SOURCES = \
- gste-popsquares.c \
- gste-popsquares.h \
- popsquares.c \
+popsquares_SOURCES = \
+ gste-popsquares.c \
+ gste-popsquares.h \
+ popsquares.c \
$(NULL)
-popsquares_LDADD = \
- libgs-theme-engine.a \
- $(XFCE_SCREENSAVER_SAVER_LIBS) \
+popsquares_LDADD = \
+ libgs-theme-engine.a \
+ $(XFCE_SCREENSAVER_SAVER_LIBS) \
$(NULL)
-slideshow_SOURCES = \
- gste-slideshow.c \
- gste-slideshow.h \
- xdg-user-dir-lookup.c \
- xdg-user-dir-lookup.h \
- slideshow.c \
+slideshow_SOURCES = \
+ gste-slideshow.c \
+ gste-slideshow.h \
+ xdg-user-dir-lookup.c \
+ xdg-user-dir-lookup.h \
+ slideshow.c \
$(NULL)
-slideshow_LDADD = \
- libgs-theme-engine.a \
- $(XFCE_SCREENSAVER_SAVER_LIBS) \
+slideshow_LDADD = \
+ libgs-theme-engine.a \
+ $(XFCE_SCREENSAVER_SAVER_LIBS) \
$(NULL)
-EXTRA_DIST = \
- gs-theme-engine-marshal.list \
- $(DESKTOP_IN_IN_FILES) \
- $(themes_in_files) \
+EXTRA_DIST = \
+ gs-theme-engine-marshal.list \
+ $(DESKTOP_IN_IN_FILES) \
+ $(themes_in_files) \
$(NULL)
-CLEANFILES = \
- $(BUILT_SOURCES) \
- xfce-floaters.desktop.in \
- xfce-popsquares.desktop.in \
- xfce-personal-slideshow.desktop.in \
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ xfce-floaters.desktop.in \
+ xfce-popsquares.desktop.in \
+ xfce-personal-slideshow.desktop.in \
$(NULL)
-DISTCLEANFILES = \
- $(themes_DATA) \
+DISTCLEANFILES = \
+ $(themes_DATA) \
$(NULL)
-MAINTAINERCLEANFILES = \
- *~ \
- Makefile.in \
- xfce-floaters.desktop \
- xfce-personal-slideshow.desktop \
- xfce-popsquares.desktop \
+MAINTAINERCLEANFILES = \
+ *~ \
+ Makefile.in \
+ xfce-floaters.desktop \
+ xfce-personal-slideshow.desktop \
+ xfce-popsquares.desktop \
$(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
index bc5d89c..d42670d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,49 +6,49 @@ NULL =
saverdir = $(libexecdir)/xfce4-screensaver
themesdir = $(pkgdatadir)/themes
-AM_CPPFLAGS = \
- -I. \
- -I$(srcdir) \
- -DXFCEMENU_I_KNOW_THIS_IS_UNSTABLE \
- $(XFCE_SCREENSAVER_CFLAGS) \
- $(XFCE_SCREENSAVER_DIALOG_CFLAGS) \
- $(XFCE_SCREENSAVER_CAPPLET_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
- -DPREFIX=\""$(prefix)"\" \
- -DBINDIR=\""$(bindir)"\" \
- -DLIBDIR=\""$(libdir)"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DXFCELOCALEDIR=\""$(datadir)/locale"\" \
- -DSAVERDIR=\""$(saverdir)"\" \
- -DTHEMESDIR=\""$(themesdir)"\" \
- -DGTKBUILDERDIR=\"$(pkgdatadir)\" \
- -DPAM_SERVICE_NAME=\""xfce4-screensaver"\" \
- $(WARN_CFLAGS) \
- $(AUTH_CFLAGS) \
- $(DEBUG_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(LIBXFCEKBDUI_CFLAGS) \
- $(LIBXKLAVIER_CFLAGS) \
- $(SYSTEMD_CFLAGS) \
- $(ELOGIND_CFLAGS) \
+AM_CPPFLAGS = \
+ -I. \
+ -I$(srcdir) \
+ -DXFCEMENU_I_KNOW_THIS_IS_UNSTABLE \
+ $(XFCE_SCREENSAVER_CFLAGS) \
+ $(XFCE_SCREENSAVER_DIALOG_CFLAGS) \
+ $(XFCE_SCREENSAVER_CAPPLET_CFLAGS) \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ -DPREFIX=\""$(prefix)"\" \
+ -DBINDIR=\""$(bindir)"\" \
+ -DLIBDIR=\""$(libdir)"\" \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DXFCELOCALEDIR=\""$(datadir)/locale"\" \
+ -DSAVERDIR=\""$(saverdir)"\" \
+ -DTHEMESDIR=\""$(themesdir)"\" \
+ -DGTKBUILDERDIR=\"$(pkgdatadir)\" \
+ -DPAM_SERVICE_NAME=\""xfce4-screensaver"\" \
+ $(WARN_CFLAGS) \
+ $(AUTH_CFLAGS) \
+ $(DEBUG_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(LIBXFCEKBDUI_CFLAGS) \
+ $(LIBXKLAVIER_CFLAGS) \
+ $(SYSTEMD_CFLAGS) \
+ $(ELOGIND_CFLAGS) \
$(NULL)
bin_PROGRAMS = \
- xfce4-screensaver \
- xfce4-screensaver-command \
- xfce4-screensaver-preferences \
+ xfce4-screensaver \
+ xfce4-screensaver-command \
+ xfce4-screensaver-preferences \
$(NULL)
libexec_PROGRAMS = \
- xfce4-screensaver-dialog \
- xfce4-screensaver-gl-helper \
+ xfce4-screensaver-dialog \
+ xfce4-screensaver-gl-helper \
$(NULL)
-noinst_PROGRAMS = \
- test-passwd \
- test-window \
+noinst_PROGRAMS = \
+ test-passwd \
+ test-window \
$(NULL)
desktopdir = $(sysconfdir)/xdg/autostart
@@ -56,178 +56,178 @@ desktop_in_files = xfce4-screensaver.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-xfce4_screensaver_command_SOURCES = \
- xfce4-screensaver-command.c \
+xfce4_screensaver_command_SOURCES = \
+ xfce4-screensaver-command.c \
$(NULL)
-xfce4_screensaver_command_LDADD = \
- $(XFCE_SCREENSAVER_COMMAND_LIBS) \
+xfce4_screensaver_command_LDADD = \
+ $(XFCE_SCREENSAVER_COMMAND_LIBS) \
$(NULL)
-AUTH_SOURCES = \
- gs-auth.h \
- gs-auth- at AUTH_SCHEME@.c \
+AUTH_SOURCES = \
+ gs-auth.h \
+ gs-auth- at AUTH_SCHEME@.c \
$(NULL)
-test_passwd_SOURCES = \
- test-passwd.c \
- $(AUTH_SOURCES) \
- setuid.c \
- setuid.h \
- subprocs.c \
- subprocs.h \
+test_passwd_SOURCES = \
+ test-passwd.c \
+ $(AUTH_SOURCES) \
+ setuid.c \
+ setuid.h \
+ subprocs.c \
+ subprocs.h \
$(NULL)
-test_passwd_LDADD = \
- $(XFCE_SCREENSAVER_DIALOG_LIBS)\
- $(AUTH_LIBS) \
+test_passwd_LDADD = \
+ $(XFCE_SCREENSAVER_DIALOG_LIBS) \
+ $(AUTH_LIBS) \
$(NULL)
-test_window_SOURCES = \
- test-window.c \
- gs-window.h \
- gs-window-x11.c \
- gs-grab-x11.c \
- gs-grab.h \
- gs-marshal.c \
- gs-marshal.h \
- gs-debug.c \
- gs-debug.h \
- subprocs.c \
- subprocs.h \
+test_window_SOURCES = \
+ test-window.c \
+ gs-window.h \
+ gs-window-x11.c \
+ gs-grab-x11.c \
+ gs-grab.h \
+ gs-marshal.c \
+ gs-marshal.h \
+ gs-debug.c \
+ gs-debug.h \
+ subprocs.c \
+ subprocs.h \
$(NULL)
-test_window_LDADD = \
- $(XFCE_SCREENSAVER_LIBS) \
- $(SAVER_LIBS) \
+test_window_LDADD = \
+ $(XFCE_SCREENSAVER_LIBS) \
+ $(SAVER_LIBS) \
$(NULL)
xfce4_screensaver_dialog_built_sources = \
- xfce4-screensaver-dialog-css.h \
+ xfce4-screensaver-dialog-css.h \
xfce4-screensaver-dialog-ui.h
-xfce4_screensaver_dialog_SOURCES = \
- $(xfce4_screensaver_dialog_built_sources) \
- xfce4-screensaver-dialog.c \
- gs-lock-plug.c \
- gs-lock-plug.h \
- gs-debug.c \
- gs-debug.h \
- setuid.c \
- setuid.h \
- subprocs.c \
- subprocs.h \
- xfce-desktop-utils.c \
- xfce-desktop-utils.h \
- xfcekbd-indicator.c \
- xfcekbd-indicator.h \
- xfcekbd-indicator-config.c \
- xfcekbd-indicator-config.h \
- xfcekbd-config-private.h \
- xfcekbd-desktop-config.c \
- xfcekbd-desktop-config.h \
- xfcekbd-keyboard-config.c \
- xfcekbd-keyboard-config.h \
- xfce-bg.c \
- xfce-bg.h \
- $(AUTH_SOURCES) \
+xfce4_screensaver_dialog_SOURCES = \
+ $(xfce4_screensaver_dialog_built_sources) \
+ xfce4-screensaver-dialog.c \
+ gs-lock-plug.c \
+ gs-lock-plug.h \
+ gs-debug.c \
+ gs-debug.h \
+ setuid.c \
+ setuid.h \
+ subprocs.c \
+ subprocs.h \
+ xfce-desktop-utils.c \
+ xfce-desktop-utils.h \
+ xfcekbd-indicator.c \
+ xfcekbd-indicator.h \
+ xfcekbd-indicator-config.c \
+ xfcekbd-indicator-config.h \
+ xfcekbd-config-private.h \
+ xfcekbd-desktop-config.c \
+ xfcekbd-desktop-config.h \
+ xfcekbd-keyboard-config.c \
+ xfcekbd-keyboard-config.h \
+ xfce-bg.c \
+ xfce-bg.h \
+ $(AUTH_SOURCES) \
$(NULL)
EXTRA_xfce4_screensaver_dialog_SOURCES = \
- gs-auth-helper.c \
- gs-auth-pwent.c \
- gs-auth-bsdauth.c \
- xfce-desktop-utils.c \
- xfce-desktop-utils.h \
- xfcekbd-indicator.c \
- xfcekbd-indicator.h \
- xfcekbd-indicator-config.c \
- xfcekbd-indicator-config.h \
- xfcekbd-config-private.h \
- xfcekbd-desktop-config.c \
- xfcekbd-desktop-config.h \
- xfcekbd-keyboard-config.c \
- xfcekbd-keyboard-config.h \
+ gs-auth-helper.c \
+ gs-auth-pwent.c \
+ gs-auth-bsdauth.c \
+ xfce-desktop-utils.c \
+ xfce-desktop-utils.h \
+ xfcekbd-indicator.c \
+ xfcekbd-indicator.h \
+ xfcekbd-indicator-config.c \
+ xfcekbd-indicator-config.h \
+ xfcekbd-config-private.h \
+ xfcekbd-desktop-config.c \
+ xfcekbd-desktop-config.h \
+ xfcekbd-keyboard-config.c \
+ xfcekbd-keyboard-config.h \
$(NULL)
-xfce4_screensaver_dialog_LDADD = \
- $(XFCE_SCREENSAVER_DIALOG_LIBS)\
- $(XFCE_SCREENSAVER_LIBS)\
- $(SAVER_LIBS) \
- $(AUTH_LIBS) \
- $(LIBXFCEKBDUI_LIBS) \
+xfce4_screensaver_dialog_LDADD = \
+ $(XFCE_SCREENSAVER_DIALOG_LIBS) \
+ $(XFCE_SCREENSAVER_LIBS) \
+ $(SAVER_LIBS) \
+ $(AUTH_LIBS) \
+ $(LIBXFCEKBDUI_LIBS) \
$(NULL)
-BUILT_SOURCES = \
- gs-marshal.c \
- gs-marshal.h \
- xfcekbd-indicator-marshal.h \
+BUILT_SOURCES = \
+ gs-marshal.c \
+ gs-marshal.h \
+ xfcekbd-indicator-marshal.h \
$(NULL)
gs-marshal.c: gs-marshal.list
- echo "#include \"gs-marshal.h\"" > $@ && \
+ echo "#include \"gs-marshal.h\"" > $@ && \
@GLIB_GENMARSHAL@ $< --prefix=gs_marshal --body >> $@
gs-marshal.h: gs-marshal.list
@GLIB_GENMARSHAL@ $< --prefix=gs_marshal --header > $@
-xfce4_screensaver_SOURCES = \
- xfce4-screensaver.c \
- xfce4-screensaver.h \
- gs-monitor.c \
- gs-monitor.h \
- gs-listener-dbus.c \
- gs-listener-dbus.h \
- gs-listener-x11.c \
- gs-listener-x11.h \
- gs-manager.c \
- gs-manager.h \
- gs-window-x11.c \
- gs-window.h \
- gs-prefs.c \
- gs-prefs.h \
- gs-theme-manager.c \
- gs-theme-manager.h \
- gs-job.c \
- gs-job.h \
- gs-debug.c \
- gs-debug.h \
- subprocs.c \
- subprocs.h \
- gs-grab-x11.c \
- gs-grab.h \
- xfce-bg.c \
- xfce-bg.h \
- xfce-desktop-utils.c \
- xfce-desktop-utils.h \
- xfcekbd-indicator.c \
- xfcekbd-indicator.h \
- xfcekbd-indicator-config.c \
- xfcekbd-indicator-config.h \
- xfcekbd-config-private.h \
- xfcekbd-desktop-config.c \
- xfcekbd-desktop-config.h \
- xfcekbd-keyboard-config.c \
- xfcekbd-keyboard-config.h \
- $(BUILT_SOURCES) \
+xfce4_screensaver_SOURCES = \
+ xfce4-screensaver.c \
+ xfce4-screensaver.h \
+ gs-monitor.c \
+ gs-monitor.h \
+ gs-listener-dbus.c \
+ gs-listener-dbus.h \
+ gs-listener-x11.c \
+ gs-listener-x11.h \
+ gs-manager.c \
+ gs-manager.h \
+ gs-window-x11.c \
+ gs-window.h \
+ gs-prefs.c \
+ gs-prefs.h \
+ gs-theme-manager.c \
+ gs-theme-manager.h \
+ gs-job.c \
+ gs-job.h \
+ gs-debug.c \
+ gs-debug.h \
+ subprocs.c \
+ subprocs.h \
+ gs-grab-x11.c \
+ gs-grab.h \
+ xfce-bg.c \
+ xfce-bg.h \
+ xfce-desktop-utils.c \
+ xfce-desktop-utils.h \
+ xfcekbd-indicator.c \
+ xfcekbd-indicator.h \
+ xfcekbd-indicator-config.c \
+ xfcekbd-indicator-config.h \
+ xfcekbd-config-private.h \
+ xfcekbd-desktop-config.c \
+ xfcekbd-desktop-config.h \
+ xfcekbd-keyboard-config.c \
+ xfcekbd-keyboard-config.h \
+ $(BUILT_SOURCES) \
$(NULL)
-xfce4_screensaver_gl_helper_LDADD = \
- $(XFCE_SCREENSAVER_LIBS) \
- $(GL_LIBS) \
+xfce4_screensaver_gl_helper_LDADD = \
+ $(XFCE_SCREENSAVER_LIBS) \
+ $(GL_LIBS) \
$(NULL)
-xfce4_screensaver_gl_helper_SOURCES = \
- xfce4-screensaver-gl-helper.c \
- gs-visual-gl.c \
- gs-visual-gl.h \
+xfce4_screensaver_gl_helper_SOURCES = \
+ xfce4-screensaver-gl-helper.c \
+ gs-visual-gl.c \
+ gs-visual-gl.h \
$(NULL)
-xfce4_screensaver_LDADD = \
- $(XFCE_SCREENSAVER_LIBS) \
- $(SAVER_LIBS) \
- $(SYSTEMD_LIBS) \
- $(ELOGIND_LIBS) \
+xfce4_screensaver_LDADD = \
+ $(XFCE_SCREENSAVER_LIBS) \
+ $(SAVER_LIBS) \
+ $(SYSTEMD_LIBS) \
+ $(ELOGIND_LIBS) \
$(NULL)
xfce4_screensaver_LDFLAGS = -export-dynamic
@@ -235,34 +235,34 @@ xfce4_screensaver_LDFLAGS = -export-dynamic
xfce4_screensaver_preferences_built_sources = \
xfce4-screensaver-preferences-ui.h
-xfce4_screensaver_preferences_SOURCES = \
- $(xfce4_screensaver_preferences_built_sources) \
- xfce4-screensaver-preferences.c \
- copy-theme-dialog.c \
- copy-theme-dialog.h \
- gs-theme-manager.c \
- gs-theme-manager.h \
- gs-job.c \
- gs-job.h \
- gs-debug.c \
- gs-debug.h \
- subprocs.c \
- subprocs.h \
- xfce-desktop-utils.c \
- xfce-desktop-utils.h \
- xfcekbd-indicator.c \
- xfcekbd-indicator.h \
- xfcekbd-indicator-config.c \
- xfcekbd-indicator-config.h \
- xfcekbd-config-private.h \
- xfcekbd-desktop-config.c \
- xfcekbd-desktop-config.h \
- xfcekbd-keyboard-config.c \
- xfcekbd-keyboard-config.h \
+xfce4_screensaver_preferences_SOURCES = \
+ $(xfce4_screensaver_preferences_built_sources) \
+ xfce4-screensaver-preferences.c \
+ copy-theme-dialog.c \
+ copy-theme-dialog.h \
+ gs-theme-manager.c \
+ gs-theme-manager.h \
+ gs-job.c \
+ gs-job.h \
+ gs-debug.c \
+ gs-debug.h \
+ subprocs.c \
+ subprocs.h \
+ xfce-desktop-utils.c \
+ xfce-desktop-utils.h \
+ xfcekbd-indicator.c \
+ xfcekbd-indicator.h \
+ xfcekbd-indicator-config.c \
+ xfcekbd-indicator-config.h \
+ xfcekbd-config-private.h \
+ xfcekbd-desktop-config.c \
+ xfcekbd-desktop-config.h \
+ xfcekbd-keyboard-config.c \
+ xfcekbd-keyboard-config.h \
$(NULL)
-xfce4_screensaver_preferences_LDADD = \
- $(XFCE_SCREENSAVER_CAPPLET_LIBS) \
+xfce4_screensaver_preferences_LDADD = \
+ $(XFCE_SCREENSAVER_CAPPLET_LIBS) \
$(NULL)
if MAINTAINER_MODE
@@ -277,23 +277,23 @@ xfce4-screensaver-preferences-ui.h: $(srcdir)/xfce4-screensaver-preferences.ui M
$(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=xfce4_screensaver_preferences_ui $< >$@
DISTCLEANFILES = \
- $(xfce4_screensaver_dialog_built_sources) \
+ $(xfce4_screensaver_dialog_built_sources) \
$(xfce4_screensaver_preferences_built_sources)
BUILT_SOURCES += \
- $(xfce4_screensaver_dialog_built_sources) \
+ $(xfce4_screensaver_dialog_built_sources) \
$(xfce4_screensaver_preferences_built_sources)
endif
-EXTRA_DIST = \
- debug-screensaver.sh \
- gs-marshal.list \
- xfcekbd-indicator-marshal.list \
- xfce4-screensaver.desktop.in \
- xfce4-screensaver-dialog.css \
- xfce4-screensaver-dialog.ui \
- xfce4-screensaver-preferences.ui \
+EXTRA_DIST = \
+ debug-screensaver.sh \
+ gs-marshal.list \
+ xfcekbd-indicator-marshal.list \
+ xfce4-screensaver.desktop.in \
+ xfce4-screensaver-dialog.css \
+ xfce4-screensaver-dialog.ui \
+ xfce4-screensaver-preferences.ui \
$(NULL)
GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0)
@@ -304,32 +304,32 @@ xfcekbd-indicator-marshal.h: xfcekbd-indicator-marshal.list
xfcekbd-indicator-marshal.c: xfcekbd-indicator-marshal.h
$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=xfcekbd_indicator $(srcdir)/xfcekbd-indicator-marshal.list --body > $@
-CLEANFILES = \
- $(desktop_DATA) \
- xfce4-screensaver.desktop.in \
+CLEANFILES = \
+ $(desktop_DATA) \
+ xfce4-screensaver.desktop.in \
$(BUILT_SOURCES)
-MAINTAINERCLEANFILES = \
- *~ \
+MAINTAINERCLEANFILES = \
+ *~ \
Makefile.in
install-exec-hook:
- @if [ "x at NEED_SETUID@" = "xyes" ]; then \
- echo "***" ; \
- echo "*** Warning: xfce4-screensaver has been compiled with support for" ; \
- if [ "x at AUTH_SCHEME@" = "xbsdauth" ]; then \
- echo "*** bsd_auth(3) and must be installed as a setuid root" ; \
- else \
- echo "*** shadow passwords. If your system actually uses shadow" ; \
- echo "*** passwords then it must be installed as a setuid root" ; \
- fi; \
- echo "*** program in order for locking to work. To do this, you" ; \
- echo "*** must run:" ; \
- echo "***" ; \
- echo "*** chown root $(DESTDIR)$(libexecdir)/xfce4-screensaver-dialog" ; \
- echo "*** chmod +s $(DESTDIR)$(libexecdir)/xfce4-screensaver-dialog" ; \
- echo "***" ; \
- echo "*** For now, it will be installed non-setuid, which" ; \
- echo "*** means that locking might not work." ; \
- echo "***" ; \
+ @if [ "x at NEED_SETUID@" = "xyes" ]; then \
+ echo "***" ; \
+ echo "*** Warning: xfce4-screensaver has been compiled with support for" ; \
+ if [ "x at AUTH_SCHEME@" = "xbsdauth" ]; then \
+ echo "*** bsd_auth(3) and must be installed as a setuid root" ; \
+ else \
+ echo "*** shadow passwords. If your system actually uses shadow" ; \
+ echo "*** passwords then it must be installed as a setuid root" ; \
+ fi; \
+ echo "*** program in order for locking to work. To do this, you" ; \
+ echo "*** must run:" ; \
+ echo "***" ; \
+ echo "*** chown root $(DESTDIR)$(libexecdir)/xfce4-screensaver-dialog" ; \
+ echo "*** chmod +s $(DESTDIR)$(libexecdir)/xfce4-screensaver-dialog" ; \
+ echo "***" ; \
+ echo "*** For now, it will be installed non-setuid, which" ; \
+ echo "*** means that locking might not work." ; \
+ echo "***" ; \
fi
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list