diff options
author | Simon Rettberg | 2021-04-06 14:43:39 +0200 |
---|---|---|
committer | Simon Rettberg | 2021-04-07 13:38:37 +0200 |
commit | 38886de0c3e9ea5729ef23e4c653fa2822f52e8f (patch) | |
tree | 9b799c8c968a92cc77746a95e0e8bdd90b6b13c3 /driver/Makefile.in | |
parent | Maybe not remove, but ... (diff) | |
download | xscreensaver-openslx.tar.gz xscreensaver-openslx.tar.xz xscreensaver-openslx.zip |
Diffstat (limited to 'driver/Makefile.in')
-rw-r--r-- | driver/Makefile.in | 1119 |
1 files changed, 577 insertions, 542 deletions
diff --git a/driver/Makefile.in b/driver/Makefile.in index 7baf504..0e986a9 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -1,9 +1,9 @@ -# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-2010 Jamie Zawinski. +# driver/Makefile.in --- xscreensaver, Copyright © 1997-2021 Jamie Zawinski. # the `../configure' script generates `driver/Makefile' from this file. @SET_MAKE@ .SUFFIXES: -.SUFFIXES: .c .m .o +.SUFFIXES: .c .m .o .desktop .desktop.in srcdir = @srcdir@ VPATH = @srcdir@ @@ -19,42 +19,36 @@ datadir = @datadir@ localedir = @PO_DATADIR@/locale mandir = @mandir@ libexecdir = @libexecdir@ -mansuffix = 1 -manNdir = $(mandir)/man$(mansuffix) +sysconfdir = @sysconfdir@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ +# A = suffix for user commands in /usr/bin/ +# B = suffix for helper programs in /usr/libexec/xscreensaver/ +mansuffixA = 1 +mansuffixB = 6 GTK_DATADIR = @GTK_DATADIR@ GTK_APPDIR = $(GTK_DATADIR)/applications GTK_ICONDIR = $(GTK_DATADIR)/pixmaps -GTK_GLADEDIR = $(GTK_DATADIR)/xscreensaver/glade +GTK_UIDIR = $(GTK_DATADIR)/xscreensaver/ui + +HACKDIR = @HACKDIR@ HACK_CONF_DIR = @HACK_CONF_DIR@ CC = @CC@ -OBJCC = @OBJCC@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ DEFS = @DEFS@ -INTL_DEFS = -DLOCALEDIR=\"$(localedir)\" -SUBP_DEFS = $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"' -GTK_DEFS = $(DEFS) -DDEFAULT_ICONDIR='"$(GTK_GLADEDIR)"' -CONF_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' LIBS = @LIBS@ -INTL_LIBS = @INTLLIBS@ -JPEG_LIBS = @JPEG_LIBS@ -PERL = @PERL@ DEPEND = @DEPEND@ DEPEND_FLAGS = @DEPEND_FLAGS@ DEPEND_DEFINES = @DEPEND_DEFINES@ -SHELL = /bin/sh INSTALL = @INSTALL@ SUID_FLAGS = -o root -m 4755 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_SETUID = @INSTALL_SETUID@ +INSTALL_SETUID = $(INSTALL_PROGRAM) $(SUID_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIRS = @INSTALL_DIRS@ @@ -62,8 +56,11 @@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ -XMU_LIBS = @XMU_LIBS@ PNG_LIBS = @PNG_LIBS@ +XFT_LIBS = @XFT_LIBS@ + +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTL_LIBS = @INTLLIBS@ # Note: # @@ -74,15 +71,18 @@ PNG_LIBS = @PNG_LIBS@ # (e.g., -lsocket, -lnsl, etc.) # # I think (but am not totally sure) that LIBS is also really "LDFLAGS". -# -# SAVER_LIBS is the link line for "xscreensaver", and -# CMD_LIBS is the link line for "xscreensaver-command". -# GETIMG_LIBS is the link line for "xscreensaver-getimage". AD_DIR = @APPDEFAULTS@ -PAM_DIR = /etc/pam.d -PAM_CONF = /etc/pam.conf + +# $(sysconfdir) is either /usr/local/etc or /usr/etc but this must be /etc. +PAM_ROOT = /etc +PAM_DIR = $(PAM_ROOT)/pam.d +PAM_CONF = $(PAM_ROOT)/pam.conf + +ICON_SRC = $(UTILS_SRC)/images +LOGO = $(ICON_SRC)/logo-50.xpm +GTK_ICONS = $(ICON_SRC)/screensaver-*.png UTILS_SRC = $(srcdir)/../utils UTILS_BIN = ../utils @@ -90,11 +90,40 @@ UTILS_BIN = ../utils INCLUDES_1 = -I. -I$(srcdir) -I$(UTILS_SRC) -I.. INCLUDES = $(INCLUDES_1) @INCLUDES@ -MOTIF_SRCS = demo-Xm.c demo-Xm-widgets.c -MOTIF_OBJS = demo-Xm.o demo-Xm-widgets.o +LIBS_PRE = $(LIBS) $(X_LIBS) $(X_PRE_LIBS) +LIBS_POST = $(X_EXTRA_LIBS) -GTK_SRCS = demo-Gtk.c demo-Gtk-conf.c -GTK_OBJS = demo-Gtk.o demo-Gtk-conf.o @GTK_EXTRA_OBJS@ +XDPMS_LIBS = @XDPMS_LIBS@ +XINERAMA_LIBS = @XINERAMA_LIBS@ $(FIXME) +XINPUT_LIBS = -lXi +XML_LIBS = @XML_LIBS@ + +DAEMON_DEFS = -DDEFAULT_PATH_PREFIX='"@HACKDIR@"' -DAD_DIR='"$(AD_DIR)"' +DAEMON_SRCS = xscreensaver.c blurb.c atoms.c clientmsg.c xinput.c prefs.c +DAEMON_OBJS = xscreensaver.o blurb.o atoms.o clientmsg.o xinput.o prefs.o \ + $(UTILS_BIN)/xmu.o +DAEMON_LIBS = $(LIBS_PRE) $(XINPUT_LIBS) -lX11 $(LIBS_POST) + +GFX_DEFS = -DLOCALEDIR=\"$(localedir)\" +GFX_SRCS = xscreensaver-gfx.c screens.c windows.c subprocs.c \ + exec.c prefsw.c dpms.c fade.c exts.c atomswm.c +GFX_OBJS = xscreensaver-gfx.o screens.o windows.o subprocs.o \ + exec.o prefsw.o dpms.o fade.o exts.o atomswm.o \ + prefs.o blurb.o atoms.o clientmsg.o xinput.o \ + $(UTILS_BIN)/xmu.o \ + $(UTILS_BIN)/yarandom.o \ + $(UTILS_BIN)/resources.o \ + $(UTILS_BIN)/visual.o \ + $(UTILS_BIN)/usleep.o \ + $(UTILS_BIN)/font-retry.o \ + $(UTILS_BIN)/logo.o \ + $(UTILS_BIN)/minixpm.o \ + $(UTILS_BIN)/xft.o \ + $(UTILS_BIN)/utf8wc.o \ + $(UTILS_BIN)/xshm.o \ + $(UTILS_BIN)/aligned_malloc.o +GFX_LIBS = $(LIBS_PRE) $(XFT_LIBS) $(XDPMS_LIBS) $(XINERAMA_LIBS) \ + @SAVER_LIBS@ -lXt -lX11 -lXext -lXi $(LIBS_POST) $(INTL_LIBS) PWENT_SRCS = passwd-pwent.c PWENT_OBJS = passwd-pwent.o @@ -108,209 +137,186 @@ PAM_OBJS = passwd-pam.o PWHELPER_SRCS = passwd-helper.c PWHELPER_OBJS = passwd-helper.o -LOCK_SRCS_1 = lock.c passwd.c -LOCK_OBJS_1 = lock.o passwd.o -NOLOCK_SRCS_1 = lock.c -NOLOCK_OBJS_1 = lock.o - -SYSTEMD_SRCS = xscreensaver-systemd.c -SYSTEMD_OBJS = xscreensaver-systemd.o -SYSTEMD_LIBS = -lsystemd - -TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c \ - test-apm.c test-fade.c test-xinerama.c test-vp.c \ - test-randr.c xdpyinfo.c test-mlstring.c test-screens.c \ - test-yarandom.c -TEST_EXES = test-passwd test-uid test-xdpms test-grab \ - test-apm test-fade test-xinerama test-vp \ - test-randr xdpyinfo test-mlstring test-screens \ - test-yarandom - -MOTIF_LIBS = @MOTIF_LIBS@ @PNG_LIBS@ $(XMU_LIBS) -GTK_LIBS = @GTK_LIBS@ $(XMU_LIBS) -XML_LIBS = @XML_LIBS@ - -XDPMS_LIBS = @XDPMS_LIBS@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XINPUT_LIBS = @XINPUT_LIBS@ - PASSWD_SRCS = @PASSWD_SRCS@ PASSWD_OBJS = @PASSWD_OBJS@ -PASSWD_LIBS = @PASSWD_LIBS@ LOCK_SRCS = @LOCK_SRCS@ LOCK_OBJS = @LOCK_OBJS@ -XMU_SRCS = @XMU_SRCS@ -XMU_OBJS = @XMU_OBJS@ - -GL_SRCS = @SAVER_GL_SRCS@ -GL_OBJS = @SAVER_GL_OBJS@ -GL_LIBS = @SAVER_GL_LIBS@ - -ICON_SRC = $(UTILS_SRC)/images -LOGO = $(ICON_SRC)/logo-50.xpm -GTK_ICONS = $(ICON_SRC)/screensaver-*.png -DEMO_UTIL_SRCS = $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \ - $(UTILS_SRC)/visual.c $(XMU_SRCS) -DEMO_UTIL_OBJS = $(UTILS_BIN)/resources.o $(UTILS_BIN)/usleep.o \ - $(UTILS_BIN)/visual.o $(XMU_OBJS) - -SAVER_UTIL_SRCS = $(UTILS_SRC)/fade.c $(UTILS_SRC)/overlay.c \ - $(UTILS_SRC)/logo.c $(UTILS_SRC)/yarandom.c \ - $(UTILS_SRC)/minixpm.c $(UTILS_SRC)/font-retry.c \ - $(DEMO_UTIL_SRCS) -SAVER_UTIL_OBJS = $(UTILS_BIN)/fade.o $(UTILS_BIN)/overlay.o \ - $(UTILS_BIN)/logo.o $(UTILS_BIN)/yarandom.o \ - $(UTILS_BIN)/minixpm.o $(UTILS_BIN)/font-retry.o \ - $(DEMO_UTIL_OBJS) - -GETIMG_SRCS_1 = xscreensaver-getimage.c -GETIMG_OBJS_1 = xscreensaver-getimage.o - -GETIMG_SRCS = $(GETIMG_SRCS_1) \ - $(UTILS_BIN)/colorbars.o $(UTILS_BIN)/resources.o \ - $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/visual.o \ - $(UTILS_BIN)/usleep.o $(UTILS_BIN)/hsv.o \ - $(UTILS_BIN)/colors.o $(UTILS_BIN)/grabscreen.o \ - $(UTILS_BIN)/logo.o $(UTILS_BIN)/minixpm.o prefs.o \ - $(XMU_SRCS) - -GETIMG_OBJS = $(GETIMG_OBJS_1) \ - $(UTILS_BIN)/colorbars.o $(UTILS_BIN)/resources.o \ - $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/visual.o \ - $(UTILS_BIN)/usleep.o $(UTILS_BIN)/hsv.o \ - $(UTILS_BIN)/colors.o $(UTILS_BIN)/grabscreen.o \ - $(UTILS_BIN)/logo.o $(UTILS_BIN)/minixpm.o prefs.o \ - $(XMU_OBJS) - -SAVER_SRCS_1 = xscreensaver.c windows.c screens.c timers.c subprocs.c \ - exec.c xset.c splash.c setuid.c stderr.c mlstring.c -SAVER_OBJS_1 = xscreensaver.o windows.o screens.o timers.o subprocs.o \ - exec.o xset.o splash.o setuid.o stderr.o mlstring.o - -SAVER_SRCS = $(SAVER_SRCS_1) prefs.c dpms.c $(LOCK_SRCS) \ - $(SAVER_UTIL_SRCS) $(GL_SRCS) -SAVER_OBJS = $(SAVER_OBJS_1) prefs.o dpms.o $(LOCK_OBJS) \ - $(SAVER_UTIL_OBJS) $(GL_OBJS) +AUTH_DEFS = -DLOCALEDIR=\"$(localedir)\" -DAD_DIR='"$(AD_DIR)"' +AUTH_SRCS = xscreensaver-auth.c dialog.c passwd.c setuid.c +AUTH_OBJS = xscreensaver-auth.o $(AUTH_OBJS_1) +AUTH_OBJS_1 = dialog.o passwd.o setuid.o \ + @PASSWD_OBJS@ \ + blurb.o screens.o xinput.o prefs.o atoms.o atomswm.o \ + $(UTILS_BIN)/xft.o \ + $(UTILS_BIN)/xftwrap.o \ + $(UTILS_BIN)/utf8wc.o \ + $(UTILS_BIN)/font-retry.o \ + $(UTILS_BIN)/yarandom.o \ + $(UTILS_BIN)/usleep.o \ + $(UTILS_BIN)/resources.o \ + $(UTILS_BIN)/logo.o \ + $(UTILS_BIN)/minixpm.o +AUTH_LIBS = $(LIBS_PRE) $(XFT_LIBS) $(XINPUT_LIBS) $(XINERAMA_LIBS) \ + @SAVER_LIBS@ -lXt -lX11 -lXext -lXi \ + @PASSWD_LIBS@ $(LIBS_POST) $(INTL_LIBS) + +SYSTEMD_DEFS = +SYSTEMD_SRCS = xscreensaver-systemd.c +SYSTEMD_OBJS = xscreensaver-systemd.o blurb.o $(UTILS_BIN)/yarandom.o +SYSTEMD_LIBS = $(LIBS_PRE) @SYSTEMD_LIBS@ -lX11 $(LIBS_POST) +CMD_DEFS = CMD_SRCS = remote.c xscreensaver-command.c -CMD_OBJS = remote.o xscreensaver-command.o - -DEMO_SRCS_1 = prefs.c dpms.c -DEMO_OBJS_1 = prefs.o dpms.o - -DEMO_SRCS = $(DEMO_SRCS_1) remote.c exec.c $(DEMO_UTIL_SRCS) -DEMO_OBJS = $(DEMO_OBJS_1) remote.o exec.o $(DEMO_UTIL_OBJS) - -PDF2JPEG_SRCS = pdf2jpeg.m -PDF2JPEG_OBJS = pdf2jpeg.o -PDF2JPEG_LIBS = -framework Cocoa - -SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \ - $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \ - -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ - $(PASSWD_LIBS) $(INTL_LIBS) - -CMD_LIBS = $(LIBS) $(X_LIBS) \ - $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) - -GETIMG_LIBS = $(LIBS) $(X_LIBS) $(PNG_LIBS) $(JPEG_LIBS) \ - $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) - -EXES = xscreensaver xscreensaver-command xscreensaver-demo \ - xscreensaver-getimage @EXES_OSX@ @EXES_SYSTEMD@ -EXES2 = @ALL_DEMO_PROGRAMS@ -EXES_OSX = pdf2jpeg +CMD_OBJS = remote.o xscreensaver-command.o blurb.o atoms.o clientmsg.o +CMD_LIBS = $(LIBS_PRE) $(XINPUT_LIBS) -lX11 -lXext $(LIBS_POST) + +GTK_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' \ + -DDEFAULT_PATH_PREFIX='"@HACKDIR@"' \ + -DDEFAULT_ICONDIR='"$(GTK_UIDIR)"' \ + -DLOCALEDIR=\"$(localedir)\" \ + -I$(ICON_SRC) +GTK_SRCS = demo-Gtk.c demo-Gtk-conf.c +GTK_OBJS = demo-Gtk.o demo-Gtk-conf.o \ + blurb.o exec.o prefs.o prefsw.o dpms.o remote.o \ + clientmsg.o atoms.o \ + $(UTILS_BIN)/xmu.o \ + $(UTILS_BIN)/resources.o \ + $(UTILS_BIN)/visual.o \ + $(UTILS_BIN)/usleep.o +GTK_LIBS = $(LIBS_PRE) $(INTL_LIBS) $(XDPMS_LIBS) \ + $(XINERAMA_LIBS) $(XML_LIBS) @GTK_LIBS@ \ + -lXt -lX11 -lXext -lXi $(LIBS_POST) + +MOTIF_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' \ + -DDEFAULT_PATH_PREFIX='"@HACKDIR@"' +MOTIF_SRCS = demo-Xm.c demo-Xm-widgets.c +MOTIF_OBJS = demo-Xm.o demo-Xm-widgets.o \ + blurb.o exec.o prefs.o prefsw.o dpms.o remote.o \ + clientmsg.o atoms.o \ + $(UTILS_BIN)/xmu.o \ + $(UTILS_BIN)/resources.o \ + $(UTILS_BIN)/visual.o \ + $(UTILS_BIN)/usleep.o +MOTIF_LIBS = $(LIBS_PRE) $(XDPMS_LIBS) $(XDPMS_LIBS) @MOTIF_LIBS@ \ + @PNG_LIBS@ -lXt -lX11 -lXext -lXi $(LIBS_POST) + +TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c \ + test-fade.c test-xinerama.c test-vp.c test-randr.c \ + xdpyinfo.c test-screens.c test-yarandom.c test-xinput.c \ + test-xkb.c +TEST_EXES = test-passwd test-uid test-xdpms test-grab \ + test-fade test-xinerama test-vp test-randr \ + xdpyinfo test-screens test-yarandom test-xinput \ + test-xkb + +EXES = xscreensaver xscreensaver-command xscreensaver-settings +UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@ +SETUID_EXES = xscreensaver-auth +DEMO_EXES = @ALL_DEMO_PROGRAMS@ EXES_SYSTEMD = xscreensaver-systemd -SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ - xscreensaver-text -SCRIPTS_OSX = xscreensaver-getimage-desktop -SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ - HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ xscreensaver.h prefs.h remote.h exec.h \ - demo-Gtk-conf.h auth.h mlstring.h types.h -MEN_1 = xscreensaver.man xscreensaver-demo.man \ - xscreensaver-command.man \ - xscreensaver-text.man \ - xscreensaver-getimage.man \ - xscreensaver-getimage-file.man \ - xscreensaver-getimage-video.man \ - xscreensaver-systemd.man -MEN_OSX = xscreensaver-getimage-desktop.man pdf2jpeg.man -MEN = $(MEN_1) @MEN_OSX@ + demo-Gtk-conf.h auth.h types.h blurb.h atoms.h clientmsg.h \ + screens.h xinput.h fade.h +MENA = xscreensaver.man xscreensaver-settings.man \ + xscreensaver-command.man +MENB = xscreensaver-gfx.man xscreensaver-auth.man \ + xscreensaver-command.man xscreensaver-systemd.man EXTRAS = README Makefile.in \ XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam.in \ - xscreensaver-demo.glade2.in xscreensaver-demo.glade2p \ - screensaver-properties.desktop.in \ + xscreensaver.ui screensaver-properties.desktop.in \ .gdbinit -VMSFILES = compile_axp.com compile_decc.com link_axp.com link_decc.com \ - vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \ - vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt -TARFILES = $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) $(SYSTEMD_SRCS) \ - $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) $(PWHELPER_SRCS) \ - $(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \ - $(CMD_SRCS) $(GETIMG_SRCS_1) $(PDF2JPEG_SRCS) $(HDRS) \ - $(SCRIPTS_1) $(SCRIPTS_OSX) $(MEN_1) $(MEN_OSX) \ - $(TEST_SRCS) +TARFILES = $(DAEMON_SRCS) $(GFX_SRCS) $(AUTH_SRCS) $(SYSTEMD_SRCS) \ + $(CMD_SRCS) $(GTK_SRCS) $(MOTIF_SRCS) $(PWENT_SRCS) \ + $(PWHELPER_SRCS) $(KERBEROS_SRCS) $(PAM_SRCS) \ + $(HDRS) $(MENA) $(MENB) $(TEST_SRCS) $(EXTRAS) +default: $(EXES) $(UTIL_EXES) $(SETUID_EXES) +all: $(EXES) $(UTIL_EXES) $(SETUID_EXES) $(DEMO_EXES) +tests: $(TEST_EXES) -default: $(EXES) -all: $(EXES) $(EXES2) -tests: $(TEST_EXES) -install: install-program install-ad install-scripts \ - install-gnome install-man install-xml install-pam -uninstall: uninstall-program uninstall-ad \ - uninstall-gnome uninstall-man uninstall-xml +############################################################################## +# +# Installation +# +############################################################################## -install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \ - install +install: install-program install-ad install-man install-xml \ + install-pam install-gnome +uninstall: uninstall-program uninstall-ad uninstall-man uninstall-xml \ + uninstall-gnome -install-program: $(EXES) - @if [ ! -d $(install_prefix)$(bindir) ]; then \ - $(INSTALL_DIRS) $(install_prefix)$(bindir) ; \ +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install + +install-program:: $(EXES) + @if [ ! -d $(install_prefix)$(bindir) ]; then \ + $(INSTALL_DIRS) $(install_prefix)$(bindir) ; \ + fi ; \ + if [ ! -d $(install_prefix)$(HACKDIR) ]; then \ + $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ; \ fi - @inst="$(INSTALL_PROGRAM)" ; \ - if [ @NEED_SETUID@ = yes ]; then \ - me=`PATH="$$PATH:/usr/ucb" whoami` ; \ - if [ "$$me" = root ]; then \ - inst="$(INSTALL_SETUID)" ; \ - else \ - e=echo ; \ - $$e "" ;\ - $$e " ####################################################################";\ - $$e " Warning: xscreensaver has been compiled with support for shadow" ;\ - $$e " passwords. If your system actually uses shadow passwords," ;\ - $$e " then xscreensaver must be installed as a setuid root" ;\ - $$e " program in order for locking to work. To do this, you" ;\ - $$e " must run 'make install' as 'root', not as '$$me'." ;\ - $$e "" ;\ - $$e " For now, xscreensaver will be installed non-setuid, which" ;\ - $$e " means that locking might not work. (Try it and see.)" ;\ - $$e " ####################################################################";\ - $$e "" ;\ - fi ; \ - fi ; \ - echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ - $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver - @for exe in xscreensaver-command xscreensaver-demo \ - xscreensaver-getimage @EXES_OSX@ @EXES_SYSTEMD@ ; do \ - echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ - $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ + +install-program:: $(EXES) + @inst="$(INSTALL_PROGRAM)" ; \ + for exe in $(EXES); do \ + echo $$inst $$exe $(install_prefix)$(bindir)/$$exe ; \ + $$inst $$exe $(install_prefix)$(bindir)/$$exe ; \ + done + +install-program:: $(UTIL_EXES) + @inst="$(INSTALL_PROGRAM)" ; \ + for exe in $(UTIL_EXES); do \ + echo $$inst $$exe $(install_prefix)$(HACKDIR)/$$exe ; \ + $$inst $$exe $(install_prefix)$(HACKDIR)/$$exe ; \ done +install-program:: $(SETUID_EXES) + @inst="$(INSTALL_PROGRAM)" ; \ + idir="$(install_prefix)$(HACKDIR)" ; \ + if [ @SETUID_AUTH@ = yes ]; then \ + inst="$(INSTALL_SETUID)" ; \ + else \ + inst="$(INSTALL_PROGRAM)" ; \ + fi ; \ + for exe in $(SETUID_EXES); do \ + echo $$inst $$exe $$idir/$$exe ; \ + if $$inst $$exe $$idir/$$exe ; then \ + true ; \ + elif [ @SETUID_AUTH@ = yes ]; then \ + echo $(INSTALL_PROGRAM) $$exe $$idir/$$exe ; \ + if $(INSTALL_PROGRAM) $$exe $$idir/$$exe ; then \ + echo "" ; \ + echo "WARNING: unable to install $$exe setuid." ; \ + echo "WARNING: authentication may not work!" ; \ + echo "" ; \ + else \ + exit 1 ; \ + fi ; \ + else \ + exit 1 ; \ + fi ; \ + done + + +# Symlink from xscreensaver-demo -> xscreensaver-settings in /usr/bin/ +install-program:: + @D=$(install_prefix)$(bindir) ; \ + echo ln -sf xscreensaver-settings $$D/xscreensaver-demo ; \ + ln -sf xscreensaver-settings $$D/xscreensaver-demo + install-ad: XScreenSaver.ad @if [ ! -d $(install_prefix)$(AD_DIR) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(AD_DIR) ; \ - fi - @-echo $(INSTALL_DATA) XScreenSaver.ad \ + fi ; \ + echo $(INSTALL_DATA) XScreenSaver.ad \ $(install_prefix)$(AD_DIR)/XScreenSaver ; \ if $(INSTALL_DATA) XScreenSaver.ad \ $(install_prefix)$(AD_DIR)/XScreenSaver ; then \ @@ -331,101 +337,106 @@ install-ad: XScreenSaver.ad $$e "" ;\ $$e " ####################################################################";\ $$e " Warning: unable to install $(install_prefix)$(AD_DIR)/XScreenSaver" ;\ - $$e " The directory is unwritable. This is probably ok;" ;\ - $$e " xscreensaver should work without that file." ;\ + $$e " This is probably ok; it should work without that file." ;\ $$e " ####################################################################";\ $$e "" ;\ exit 0 ; \ fi \ fi -install-scripts: $(SCRIPTS) munge-scripts - @for program in $(SCRIPTS); do \ - if [ -r $$program ] ; then \ - p=$$program ; \ - else \ - p=$(srcdir)/$$program ; \ - fi ; \ - echo $(INSTALL_SCRIPT) $$p \ - $(install_prefix)$(bindir)/$$program ; \ - $(INSTALL_SCRIPT) $$p \ - $(install_prefix)$(bindir)/$$program ; \ - done - -munge-scripts: $(SCRIPTS) - @tmp=/tmp/mf.$$$$ ; \ - perl="${PERL}" ; \ - rm -f $$tmp ; \ - for program in $(SCRIPTS); do \ - sed "s@^\(#!\)\(/[^ ]*/perl[^ ]*\)\(.*\)\$$@\1$$perl\3@" \ - < $(srcdir)/$$program > $$tmp ; \ - if cmp -s $(srcdir)/$$program $$tmp ; then \ - true ; \ - else \ - echo "$$program: setting interpreter to $$perl" >&2 ; \ - cat $$tmp > ./$$program ; \ - fi ; \ - done ; \ - rm -f $$tmp - # When installing man pages, we install "foo.man" as "foo.N" and update # the .TH line in the installed file with one like # # .TH XScreenSaver N "V.VV (DD-MMM-YYYY)" "X Version 11" # -# where N is the manual section suffix. +# where N is the manual section suffix (usually 1 or 6, depending). # -install-man: $(MEN) - @men="$(MEN)" ; \ +install-man:: $(MENA) $(MENB) + @ \ U=$(UTILS_SRC)/version.h ; \ - V=`sed -n 's/.*xscreensaver \([0-9]\.[^)]*)\).*/\1/p' < $$U` ; \ - T=/tmp/xs$$$$.$(mansuffix) ; \ - TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ - echo "installing man pages: $$TH" ; \ + V=`sed -n 's/.*xscreensaver \([0-9]\.[^)]*)\).*/\1/p' < $$U | \ + head -1` ; \ + T=/tmp/xs$$$$.man ; \ + SUFA=$(mansuffixA) ; \ + SUFB=$(mansuffixB) ; \ \ - if [ ! -d $(install_prefix)$(manNdir) ]; then \ - $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ - fi ; \ + INST() { \ + TH=".TH XScreenSaver $$SUF \"$$V\" \"X Version 11\"" ; \ + DIR="$(install_prefix)$(mandir)/man$$SUF" ; \ + if [ ! -d $$DIR ]; then \ + echo $(INSTALL_DIRS) $$DIR ; \ + $(INSTALL_DIRS) $$DIR ; \ + fi ; \ \ - for man in $$men; do \ - instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ - manbase=`echo $$man | sed 's/\.man$$//'` ; \ - TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ; \ sed -e "s/^\.TH.*/$$TH/" \ - -e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/' \ - -e 's@(MANSUFFIX)@($(mansuffix))@g' \ + -e "s/^\(\.BR xscreens[^ ]* (\)[0-9]\(.*\)/\1$$SUFA\2/" \ + -e "s@(MANSUFFIX)@($$SUFB)@g" \ < $(srcdir)/$$man > $$T ; \ - echo $(INSTALL_DATA) $(srcdir)/$$man \ - $(install_prefix)$(manNdir)/$$instname ; \ - $(INSTALL_DATA) $$T \ - $(install_prefix)$(manNdir)/$$instname ; \ - done ; \ + manbase=`echo $$man | sed 's/\.man$$//'` ; \ + echo $(INSTALL_DATA) $$man $$DIR/$$manbase.$$SUF ; \ + $(INSTALL_DATA) $$T $$DIR/$$manbase.$$SUF ; \ + } ; \ + \ + SUF=$$SUFA ; for man in $(MENA); do INST ; done ; \ + SUF=$$SUFB ; for man in $(MENB); do INST ; done ; \ rm -f $$T -uninstall-program: - @for program in $(EXES) $(SCRIPTS); do \ +# Symlink from xscreensaver-demo.1 -> xscreensaver-settings.1 in /usr/man/man1/ +install-man:: + @D=$(install_prefix)$(mandir)/man$(mansuffixA) ; \ + F1=xscreensaver-settings.$(mansuffixA) ; \ + F2=xscreensaver-demo.$(mansuffixA) ; \ + echo ln -sf $$F1 $$D/$$F2 ; \ + ln -sf $$F1 $$D/$$F2 + +# These used to be in driver/ and installed into $(bindir) +# Now they are in hacks/ and are installed into ${libexecdir}/xscreensaver/ +OLD_EXES = xscreensaver-getimage xscreensaver-getimage-file \ + xscreensaver-getimage-video xscreensaver-text \ + xscreensaver-systemd +OLD_MEN = xscreensaver-getimage.man xscreensaver-getimage-file.man \ + xscreensaver-getimage-video.man xscreensaver-text.man \ + xscreensaver-demo.man +uninstall-program:: + @for program in $(EXES) $(OLD_EXES); do \ echo rm -f $(install_prefix)$(bindir)/$$program ; \ rm -f $(install_prefix)$(bindir)/$$program ; \ done +uninstall-program:: + @for program in $(UTIL_EXES) $(SETUID_EXES); do \ + echo rm -f $(install_prefix)$(HACKDIR)/$$program ; \ + rm -f $(install_prefix)$(HACKDIR)/$$program ; \ + done + uninstall-ad: rm -f $(install_prefix)$(AD_DIR)/XScreenSaver uninstall-man: - @men="$(MEN)" ; \ + @men="$(MEN) $(OLD_MEN)" ; \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ - echo rm -f $(install_prefix)$(manNdir)/$$instname* ; \ - rm -f $(install_prefix)$(manNdir)/$$instname* ; \ + echo rm -f $(install_prefix)$(manAdir)/$$instname* ; \ + rm -f $(install_prefix)$(manAdir)/$$instname* ; \ done install-pam: xscreensaver.pam - @src="xscreensaver.pam" ; \ - dest=`sed -n 's/.*PAM_SERVICE_NAME[ ]*"\([^"]*\)".*$$/\1/p' \ + @src="xscreensaver.pam" ; \ + name=`sed -n 's/.*PAM_SERVICE_NAME[ ]*"\([^"]*\)".*$$/\1/p' \ < ../config.h` ; \ dir="$(install_prefix)$(PAM_DIR)" ; \ conf="$(PAM_CONF)" ; \ \ + if [ -z "$$name" ]; then \ + echo "PAM not configured, not installing" >&2 ; \ + exit 0 ; \ + fi ; \ + \ + if [ ! -d $(install_prefix)$(PAM_ROOT) ]; then \ + echo $(INSTALL_DIRS) $(install_prefix)$(PAM_ROOT) ; \ + $(INSTALL_DIRS) $(install_prefix)$(PAM_ROOT) ; \ + fi ; \ + \ if [ -d $$dir ] ; then \ \ if [ -f $$dir/xdm ]; then \ @@ -435,52 +446,50 @@ install-pam: xscreensaver.pam fi ; \ \ if [ -z "$$src2" ]; then \ - echo $(INSTALL_DATA) $$src $$dir/$$dest ; \ - $(INSTALL_DATA) $$src $$dir/$$dest ; \ + echo $(INSTALL_DATA) $$src $$dir/$$name ; \ + $(INSTALL_DATA) $$src $$dir/$$name ; \ else \ - src="xscreensaver.pam.$$$$" ; \ - echo "grep '^#%\|^auth\|^@include' $$src2 > $$src" ; \ - grep '^#%\|^auth\|^@include' $$src2 > $$src ; \ - echo $(INSTALL_DATA) $$src $$dir/$$dest ; \ - $(INSTALL_DATA) $$src $$dir/$$dest ; \ - echo rm -f $$src ; \ - rm -f $$src ; \ + tmp="xscreensaver.pam.$$$$" ; \ + grep '^#%\|^auth\|^@include' $$src2 > $$tmp ; \ + if cmp -s $$tmp $$dir/$$name ; then \ + echo "$$dir/$$name unchanged" ; \ + else \ + echo "Updating contents of $$dir/$$name from $$src2" ; \ + $(INSTALL_DATA) $$tmp $$dir/$$name ; \ + fi ; \ + rm -f $$tmp ; \ fi ; \ \ - if [ ! -f $$dir/$$dest ]; then \ + if [ ! -f $$dir/$$name ]; then \ e=echo ; \ $$e "" ;\ $$e " ####################################################################";\ $$e " Warning: xscreensaver has been compiled with support for Pluggable" ;\ $$e " Authentication Modules (PAM). However, we were unable to" ;\ - $$e " install the file $$dir/$$dest. PAM is unlikely" ;\ - $$e " to work without this file (and old-style password" ;\ - $$e " authentication will be used instead, which may or may not" ;\ - $$e " work.)" ;\ + $$e " install the file \"$$dir/$$name\". XScreenSaver is" ;\ + $$e " unlikely to work without this file." ;\ $$e " ####################################################################";\ $$e "" ;\ fi ; \ - elif [ -f $$conf -a "x$$dest" != "x" ]; then \ - if ( grep $$dest $$conf >/dev/null ); then \ - echo "$$conf unchanged: already has an entry for $$dest" ; \ + elif [ -f $$conf -a "x$$name" != "x" ]; then \ + if ( grep $$name $$conf >/dev/null ); then \ + echo "$$conf unchanged: already has an entry for $$name" ; \ else \ - src="pam.conf.$$$$" ; \ - echo "grep -v $$dest $$conf > $$src" ; \ - grep -v $$dest $$conf > $$src ; \ - extras=`sed -n "s/^login\(.*auth.*\)$$/$$dest\1/p" $$conf`; \ - echo "$$extras" >> $$src ; \ + tmp="pam.conf.$$$$" ; \ + grep -v $$name $$conf > $$tmp ; \ + extras=`sed -n "s/^login\(.*auth.*\)$$/$$name\1/p" $$conf`; \ + echo "$$extras" >> $$tmp ; \ if [ "x$$extras" = "x" ]; then \ echo "Error: no login rules in $$conf?" >&2 ; \ else \ - echo "adding $$dest rules to $$src:" ; \ + echo "adding $$name rules to $$conf:" ; \ + echo "" ; \ echo "$$extras" | sed 's/^/ /' ; \ fi ; \ - echo $(INSTALL_DATA) $$src $$conf ; \ - $(INSTALL_DATA) $$src $$conf ; \ - echo rm -f $$src ; \ - rm -f $$src ; \ + $(INSTALL_DATA) $$tmp $$conf ; \ + rm -f $$tmp ; \ fi ; \ - if ( grep $$dest $$conf >/dev/null ); then \ + if ( grep $$name $$conf >/dev/null ); then \ echo ; \ else \ e=echo ; \ @@ -489,12 +498,17 @@ install-pam: xscreensaver.pam $$e " Warning: xscreensaver has been compiled with support for Pluggable" ;\ $$e " Authentication Modules (PAM). However, we were unable to" ;\ $$e " install xscreensaver rules in the file $$conf." ;\ - $$e " PAM is unlikely to work without this (and old-style" ;\ - $$e " password authentication will be used instead, which may" ;\ - $$e " or may not work.)" ;\ + $$e " XScreenSaver is unlikely to work without this." ;\ $$e " ####################################################################";\ $$e "" ;\ fi ; \ + else \ + e=echo ; \ + $$e "" ;\ + $$e " ####################################################################";\ + $$e " Warning: $$dir/ does not exist, not installing PAM config." ;\ + $$e " ####################################################################";\ + $$e "" ;\ fi # screensaver-properties.desktop @@ -529,43 +543,43 @@ install-gnome:: $(LOGO) fi # ../utils/images/screensaver-*.png -# into /usr/share/xscreensaver/glade/ +# into /usr/share/xscreensaver/ui/ install-gnome:: - @if [ "$(GTK_DATADIR)" != "" ]; then \ - if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ + @if [ "$(GTK_DATADIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GTK_UIDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)" ;\ fi ;\ for target in $(GTK_ICONS) ; do \ dest=`echo $$target | sed 's@^.*/@@'` ;\ echo $(INSTALL_DATA) $$target \ - $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\ + $(install_prefix)$(GTK_UIDIR)/$$dest ;\ $(INSTALL_DATA) $$target \ - $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\ + $(install_prefix)$(GTK_UIDIR)/$$dest ;\ done ;\ fi -# xscreensaver-demo.glade2 -# into /usr/share/xscreensaver/glade/ -install-gnome:: xscreensaver-demo.glade2 +# xscreensaver.ui +# into /usr/share/xscreensaver/ui/ +install-gnome:: xscreensaver.ui @if [ "$(GTK_DATADIR)" != "" ]; then \ - if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ + if [ ! -d "$(install_prefix)$(GTK_UIDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)" ;\ fi ;\ - target=xscreensaver-demo.glade2 ;\ - echo $(INSTALL_DATA) $$target \ - $(install_prefix)$(GTK_GLADEDIR)/$$target ;\ - if $(INSTALL_DATA) $$target \ - $(install_prefix)$(GTK_GLADEDIR)/$$target ;\ + target=xscreensaver.ui ;\ + echo $(INSTALL_DATA) $(srcdir)/$$target \ + $(install_prefix)$(GTK_UIDIR)/$$target ;\ + if $(INSTALL_DATA) $(srcdir)/$$target \ + $(install_prefix)$(GTK_UIDIR)/$$target ;\ then true ;\ else \ e=echo ; \ $$e "" ;\ $$e " ####################################################################";\ $$e " Warning: unable to install $$target into" ;\ - $$e " $(install_prefix)$(GTK_GLADEDIR)/." ;\ - $$e " Without this file, xscreensaver-demo will not" ;\ + $$e " $(install_prefix)$(GTK_UIDIR)/." ;\ + $$e " Without this file, xscreensaver-settings will not" ;\ $$e " be able to run properly." ;\ $$e " ####################################################################";\ $$e "" ;\ @@ -593,25 +607,34 @@ uninstall-gnome:: fi # ../utils/images/screensaver-*.png -# into /usr/share/xscreensaver/glade/ +# into /usr/share/xscreensaver/ui/ uninstall-gnome:: @if [ "$(GTK_DATADIR)" != "" ]; then \ for target in $(GTK_ICONS) ; do \ dest=`echo $$target | sed 's@^.*/@@'` ;\ - echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\ - rm -f $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\ + echo rm -f $(install_prefix)$(GTK_UIDIR)/$$dest ;\ + rm -f $(install_prefix)$(GTK_UIDIR)/$$dest ;\ done ;\ fi -# xscreensaver-demo.glade2 -# into /usr/share/xscreensaver/glade/ -uninstall-gnome:: xscreensaver-demo.glade2 +# xscreensaver.ui +# into /usr/share/xscreensaver/ui/ +uninstall-gnome:: @if [ "$(GTK_DATADIR)" != "" ]; then \ - target=xscreensaver-demo.glade2 ;\ - echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target ;\ - rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target ;\ + for target in xscreensaver.ui xscreensaver-demo.ui ; do \ + echo rm -f $(install_prefix)$(GTK_UIDIR)/$$target ;\ + rm -f $(install_prefix)$(GTK_UIDIR)/$$target ;\ + done ;\ + rmdir "$(GTK_UIDIR)" ;\ + rmdir "$(GTK_DATADIR)/xscreensaver" ;\ + exit 0 ;\ fi +# /usr/share/xscreensaver/glade/ no longer used +uninstall-gnome:: + -rm -rf $(GTK_DATADIR)/xscreensaver/glade + + # /usr/share/xscreensaver/config/README install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ @@ -627,14 +650,24 @@ install-xml: uninstall-xml: rm -f $(install_prefix)$(HACK_CONF_DIR)/README + +############################################################################## +# +# Clean and dependencies +# +############################################################################## + clean: - -rm -f *.o a.out core $(EXES) $(EXES2) $(TEST_EXES) \ + -rm -f *.o a.out core $(EXES) $(UTIL_EXES) $(SETUID_EXES) \ + $(DEMO_EXES) $(TEST_EXES) \ XScreenSaver_ad.h XScreenSaver_Xm_ad.h distclean: clean - -rm -f Makefile XScreenSaver.ad \ - TAGS *~ "#"* screensaver-properties.desktop \ - xscreensaver-demo.glade2 \ + -rm -f \ + TAGS *~ "#"* *.rej *.orig \ + Makefile \ + XScreenSaver.ad \ + screensaver-properties.desktop \ xscreensaver.pam # Adds all current dependencies to Makefile @@ -642,7 +675,7 @@ depend: XScreenSaver_ad.h XScreenSaver_Xm_ad.h $(DEPEND) -s '# DO NOT DELETE: updated by make depend' \ $(DEPEND_FLAGS) -- \ $(INCLUDES_1) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) -- \ - $(SAVER_SRCS) $(CMD_SRCS) $(GETIMG_SRCS_1) + $(SAVER_SRCS) $(CMD_SRCS) # Adds some dependencies to Makefile.in -- not totally accurate, but pretty # close. This excludes dependencies on files in /usr/include, etc. It tries @@ -655,8 +688,8 @@ distdepend: check_men update_ad_version XScreenSaver_ad.h XScreenSaver_Xm_ad.h $(INCLUDES_1) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) -- \ $(SAVER_SRCS_1) $(SYSTEMD_SRCS) $(MOTIF_SRCS) $(GTK_SRCS) \ $(PWENT_SRCS) $(PWHELPER_SRCS) $(KERBEROS_SRCS) $(PAM_SRCS) \ - $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) $(GETIMG_SRCS_1) \ - $(PDF2JPEG_SRCS) $(TEST_SRCS) 2>/dev/null | \ + $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) \ + $(TEST_SRCS) 2>/dev/null | \ sort -d | \ ( \ awk '/^# .*Makefile.in ---/,/^# DO .*distdepend/' < Makefile.in ; \ @@ -679,12 +712,12 @@ update_ad_version:: @ \ files="XScreenSaver.ad.in ../hacks/config/README ../OSX/bindist.rtf" ; \ U=$(UTILS_SRC)/version.h ; \ - V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ; \ + V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^ ]*\).*/\1/p' < $$U | head -1` ; \ Y=`date '+%Y'` ; \ D=`date '+%d-%b-%Y'` ; \ for S in $$files ; do \ T=/tmp/xs.$$$$ ; \ - sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*[ab]*[0-9]*\(.*\)/\1$$V\2/" \ + sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9.]*[ab]*[0-9]*\(.*\)/\1$$V\2/" \ -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/" \ -e "s/\( [0-9][0-9][0-9][0-9]-\)[0-9][0-9][0-9][0-9] /\1$$Y /" \ < $$S > $$T ; \ @@ -701,9 +734,9 @@ TAGS: tags tags: find $(srcdir) -name '*.[chly]' -print | xargs etags -a -echo_tarfiles: +list_tarfiles: @$(MAKE) XScreenSaver_ad.h XScreenSaver_Xm_ad.h 2>&1 >/dev/null - @echo $(TARFILES) + @find $(TARFILES) -type f -print | sort check_men: @badmen="" ; \ @@ -723,11 +756,12 @@ check_men: fi -# Rules for noticing when the objects from the utils directory are out of -# date with respect to their sources, and going and building them according -# to the rules in their own Makefile... +############################################################################## +# +# Dependencies on utils/ # -$(UTILS_BIN)/fade.o: $(UTILS_SRC)/fade.c +############################################################################## + $(UTILS_BIN)/overlay.o: $(UTILS_SRC)/overlay.c $(UTILS_BIN)/resources.o: $(UTILS_SRC)/resources.c $(UTILS_BIN)/usleep.o: $(UTILS_SRC)/usleep.c @@ -740,157 +774,219 @@ $(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c $(UTILS_BIN)/hsv.o: $(UTILS_SRC)/hsv.c $(UTILS_BIN)/colors.o: $(UTILS_SRC)/colors.c $(UTILS_BIN)/grabscreen.o: $(UTILS_SRC)/grabscreen.c +$(UTILS_BIN)/utf8wc.o: $(UTILS_SRC)/utf8wc.c +$(UTILS_BIN)/xftwrap.o: $(UTILS_SRC)/xftwrap.c $(UTILS_BIN)/font-retry.o: $(UTILS_SRC)/font-retry.c - -UTIL_OBJS = $(SAVER_UTIL_OBJS) $(UTILS_BIN)/colorbars.o \ - $(UTILS_BIN)/hsv.o $(UTILS_BIN)/colors.o \ - $(UTILS_BIN)/grabscreen.o +$(UTILS_BIN)/xshm.o: $(UTILS_SRC)/xshm.c +$(UTILS_BIN)/aligned_malloc.o: $(UTILS_SRC)/aligned_malloc.c + + +UTIL_OBJS = $(UTILS_BIN)/overlay.o \ + $(UTILS_BIN)/resources.o \ + $(UTILS_BIN)/usleep.o \ + $(UTILS_BIN)/visual.o \ + $(UTILS_BIN)/xmu.o \ + $(UTILS_BIN)/logo.o \ + $(UTILS_BIN)/minixpm.o \ + $(UTILS_BIN)/yarandom.o \ + $(UTILS_BIN)/colorbars.o \ + $(UTILS_BIN)/hsv.o \ + $(UTILS_BIN)/colors.o \ + $(UTILS_BIN)/grabscreen.o \ + $(UTILS_BIN)/xft.o \ + $(UTILS_BIN)/xftwrap.o \ + $(UTILS_BIN)/utf8wc.o \ + $(UTILS_BIN)/font-retry.o \ + $(UTILS_BIN)/xshm.o \ + $(UTILS_BIN)/aligned_malloc.o $(UTIL_OBJS): cd $(UTILS_BIN) ; \ $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + +############################################################################## +# +# Compiling the daemon: xscreensaver, xscreensaver-gfx, xscreensaver-auth, +# xscreensaver-systemd and xscreensaver-comand. +# +############################################################################## + # How we build object files in this directory. +CC_ALL=$(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) .c.o: - $(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $< - -.m.o: - $(OBJCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $< + $(CC) -c $(CC_ALL) $< -# subprocs takes an extra -D option. -subprocs.o: subprocs.c - $(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \ - $(srcdir)/subprocs.c +# # subprocs takes an extra -D option. +# subprocs.o: subprocs.c +# $(CC) -c $(CC_ALL) $(SUBP_DEFS) $< # xscreensaver takes an extra -D option. xscreensaver.o: xscreensaver.c - $(CC) -c $(INCLUDES) $(DEFS) $(INTL_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \ - $(srcdir)/xscreensaver.c + $(CC) -c $(CC_ALL) $(DAEMON_DEFS) $< -# demo-Gtk takes extra -D options, and an extra -I option. -demo-Gtk.o: demo-Gtk.c - $(CC) -c $(INCLUDES) $(SUBP_DEFS) -I$(ICON_SRC) \ - $(GTK_DEFS) $(INTL_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \ - $(srcdir)/demo-Gtk.c +xscreensaver-auth.o: XScreenSaver_ad.h +xscreensaver-auth.o: xscreensaver-auth.c + $(CC) -c $(CC_ALL) $(AUTH_DEFS) $< -# demo-Gtk-conf takes an extra -D option. -demo-Gtk-conf.o: demo-Gtk-conf.c - $(CC) -c $(INCLUDES) $(CONF_DEFS) $(GTK_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \ - $(srcdir)/demo-Gtk-conf.c +xscreensaver: $(DAEMON_OBJS) + $(CC) $(LDFLAGS) -o $@ $(DAEMON_OBJS) $(DAEMON_LIBS) +xscreensaver-gfx.o: XScreenSaver_ad.h +xscreensaver-gfx.o: xscreensaver-gfx.c + $(CC) -c $(CC_ALL) $(GFX_DEFS) $< +xscreensaver-gfx: $(GFX_OBJS) + $(CC) $(LDFLAGS) -o $@ $(GFX_OBJS) $(GFX_LIBS) -# How we build the default app-defaults file into the program. -# -XScreenSaver_ad.h: XScreenSaver.ad - $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver.ad > XScreenSaver_ad.h +dialog.o: dialog.c + $(CC) -c $(CC_ALL) $(AUTH_DEFS) $< +xscreensaver-auth: $(AUTH_OBJS) + $(CC) $(LDFLAGS) -o $@ $(AUTH_OBJS) $(AUTH_LIBS) -XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad - $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h +xscreensaver-systemd: $(SYSTEMD_OBJS) + $(CC) $(LDFLAGS) -o $@ $(SYSTEMD_OBJS) $(SYSTEMD_LIBS) -lm + +xscreensaver-command: $(CMD_OBJS) + $(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS) -@INTLTOOL_DESKTOP_RULE@ -# The executables linked in this directory. +############################################################################## +# +# Compiling the GUI, xscreensaver-settings # -xscreensaver: $(SAVER_OBJS) - $(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(SAVER_LIBS) $(INTL_LIBS) +############################################################################## -xscreensaver-command: $(CMD_OBJS) - $(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS) +demo-Gtk.o: XScreenSaver_ad.h +demo-Gtk.o: demo-Gtk.c + $(CC) -c $(CC_ALL) $(GTK_DEFS) $< +demo-Gtk-conf.o: demo-Gtk-conf.c + $(CC) -c $(CC_ALL) $(GTK_DEFS) $< + +xscreensaver-settings-Gtk: $(GTK_OBJS) + $(CC) $(LDFLAGS) -o $@ $(GTK_OBJS) $(GTK_LIBS) -xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@ +demo-Xm.o: XScreenSaver_ad.h +demo-Xm.o: demo-Xm.c + $(CC) -c $(CC_ALL) $(GTK_DEFS) $< +demo-Xm-widgets.o: demo-Xm-widgets.c + $(CC) -c $(CC_ALL) $(GTK_DEFS) $< + +xscreensaver-settings-Xm: $(MOTIF_OBJS) + $(CC) $(LDFLAGS) -o $@ $(MOTIF_OBJS) $(MOTIF_LIBS) + +xscreensaver-settings: @PREFERRED_DEMO_PROGRAM@ @if [ "@PREFERRED_DEMO_PROGRAM@" = "" ]; then \ echo "WARNING: neither GTK nor Motif are available," \ - "therefore no xscreensaver-demo!" ; \ + "therefore no xscreensaver-settings!" ; \ rm -f $@@EXEEXT@ ; \ else \ echo cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@ ; \ cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@ ; \ fi -xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) - $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \ - $(MOTIF_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \ - $(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS) -xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS) - $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \ - $(GTK_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) \ - -lXt -lX11 $(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS) +# How we build the default app-defaults file into the program. +# +XScreenSaver_ad.h:: + @TMP=/tmp/xs$$$$.h ; \ + IN="XScreenSaver.ad" ; \ + OUT=XScreenSaver_ad.h ; \ + $(UTILS_SRC)/ad2c $$IN > $$TMP ; \ + if cmp -s $$TMP $$OUT ; then \ + rm -f "$$TMP" ; \ + else \ + echo $(UTILS_SRC)/ad2c $$IN \> $$OUT ; \ + mv $$TMP $$OUT ; \ + fi -demo-Gtk.o: XScreenSaver_ad.h -demo-Xm.o: XScreenSaver_Xm_ad.h -xscreensaver.o: XScreenSaver_ad.h -xscreensaver-getimage.o: XScreenSaver_ad.h +XScreenSaver_Xm_ad.h:: + @TMP=/tmp/xs$$$$.h ; \ + IN="XScreenSaver-Xm.ad" ; \ + OUT=XScreenSaver_Xm_ad.h ; \ + $(UTILS_SRC)/ad2c $$IN > $$TMP ; \ + if cmp -s $$TMP $$OUT ; then \ + rm -f "$$TMP" ; \ + else \ + echo $(UTILS_SRC)/ad2c $$IN \> $$OUT ; \ + mv $$TMP $$OUT ; \ + fi -xscreensaver-getimage: $(GETIMG_OBJS) - $(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm -pdf2jpeg: $(PDF2JPEG_OBJS) - $(OBJCC) $(LDFLAGS) -o $@ $(PDF2JPEG_OBJS) $(PDF2JPEG_LIBS) -lm +# Replace this with @INTLTOOL_DESKTOP_RULE@ once +# https://bugs.launchpad.net/intltool/+bug/1749904 is fixed. +.desktop.in.desktop: $(INTLTOOL_MERGE) $(top_srcdir)/po/*.po + $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) \ + $(INTLTOOL_V_MERGE_OPTIONS) -d -u \ + -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -xscreensaver-systemd: $(SYSTEMD_OBJS) - $(CC) $(LDFLAGS) -o $@ $(SYSTEMD_OBJS) $(SYSTEMD_LIBS) -lm -TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \ - subprocs.o setuid.o splash.o prefs.o mlstring.o exec.o \ - $(SAVER_UTIL_OBJS) -test-passwd.o: XScreenSaver_ad.h +############################################################################## +# +# Debugging utilities, not built by default +# +############################################################################## -test-passwd: $(TEST_PASSWD_OBJS) XScreenSaver_ad.h - $(CC) $(LDFLAGS) -o $@ $(TEST_PASSWD_OBJS) $(SAVER_LIBS) +TESTPASS_OBJS = test-passwd.o test-passwd-b.o $(AUTH_OBJS_1) +TESTPATH_DEFS = -Dxscreensaver_auth_conv=test_auth_conv $(AUTH_DEFS) +test-passwd-b.o: XScreenSaver_ad.h +test-passwd-b.o: $(srcdir)/xscreensaver-auth.c + $(CC) -c $(CC_ALL) $(TESTPATH_DEFS) $< -o $@ +test-passwd: $(TESTPASS_OBJS) + $(CC) $(LDFLAGS) -o $@ $(TESTPASS_OBJS) $(AUTH_LIBS) test-uid: test-uid.o $(CC) $(LDFLAGS) -o $@ test-uid.o -test-xdpms: test-xdpms.o - $(CC) $(LDFLAGS) -o $@ test-xdpms.o $(LIBS) $(X_LIBS) $(XDPMS_LIBS) \ - $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) +TESTDPMS_LIBS = $(LIBS_PRE) $(XDPMS_LIBS) -lXt -lX11 -lXext $(LIBS_POST) +test-xdpms: test-xdpms.o blurb.o + $(CC) $(LDFLAGS) -o $@ test-xdpms.o blurb.o $(TESTDPMS_LIBS) -test-xinerama: test-xinerama.o - $(CC) $(LDFLAGS) -o $@ test-xinerama.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \ - $(X_PRE_LIBS) $(XINERAMA_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) +TESTXINPUT_OBJS = test-xinput.o blurb.o xinput.o +TESTXINPUT_LIBS = $(LIBS_PRE) $(XDPMS_LIBS) -lXi -lXt -lX11 -lXext $(LIBS_POST) +test-xinput: $(TESTXINPUT_OBJS) + $(CC) $(LDFLAGS) -o $@ $(TESTXINPUT_OBJS) $(TESTXINPUT_LIBS) -test-vp: test-vp.o - $(CC) $(LDFLAGS) -o $@ test-vp.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \ - $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) +TESTXIN_LIBS = $(LIBS_PRE) $(XINERAMA_LIBS) -lXi -lXt -lX11 -lXext $(LIBS_POST) +test-xinerama: test-xinerama.o blurb.o + $(CC) $(LDFLAGS) -o $@ test-xinerama.o blurb.o $(TESTXIN_LIBS) -test-randr: test-randr.o - $(CC) $(LDFLAGS) -o $@ test-randr.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \ - $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) +TESTXKB_OBJS = test-xkb.o blurb.o +TESTXKB_LIBS = $(LIBS_PRE) $(XDPMS_LIBS) -lXi -lXt -lX11 -lXext $(LIBS_POST) +test-xkb: $(TESTXKB_OBJS) + $(CC) $(LDFLAGS) -o $@ $(TESTXKB_OBJS) $(TESTXKB_LIBS) -test-grab: test-grab.o - $(CC) $(LDFLAGS) -o $@ test-grab.o $(SAVER_LIBS) +test-vp: test-vp.o blurb.o + $(CC) $(LDFLAGS) -o $@ test-vp.o blurb.o $(GFX_LIBS) -test-apm: test-apm.o - $(CC) $(LDFLAGS) -o $@ test-apm.o $(SAVER_LIBS) -lapm +test-randr: test-randr.o blurb.o + $(CC) $(LDFLAGS) -o $@ test-randr.o blurb.o $(GFX_LIBS) -test-mlstring.o: mlstring.c -test-mlstring: test-mlstring.o - $(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS) +TESTGRAB_LIBS = $(LIBS_PRE) -lXt -lX11 -lXext $(LIBS_POST) +test-grab: test-grab.o blurb.o + $(CC) $(LDFLAGS) -o $@ test-grab.o blurb.o $(TESTGRAB_LIBS) -TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS) -test-fade: test-fade.o $(UTILS_BIN)/fade.o - $(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS) +TEST_FADE_OBJS = test-fade.o fade.o blurb.o atoms.o clientmsg.o xinput.o \ + $(UTILS_BIN)/visual.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/usleep.o \ + $(UTILS_BIN)/logo.o $(UTILS_BIN)/minixpm.o $(UTILS_BIN)/xshm.o \ + $(UTILS_BIN)/xmu.o $(UTILS_BIN)/aligned_malloc.o +test-fade: $(TEST_FADE_OBJS) + $(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(GFX_LIBS) -TEST_SCREENS_OBJS = test-screens.o $(DEMO_UTIL_OBJS) -test-screens.o: screens.c -test-screens: test-screens.o - $(CC) $(LDFLAGS) -o $@ $(TEST_SCREENS_OBJS) $(SAVER_LIBS) +TEST_SCREENS_OBJS = test-screens.o screens.o blurb.o +test-screens: $(TEST_SCREENS_OBJS) + $(CC) $(LDFLAGS) -o $@ $(TEST_SCREENS_OBJS) $(GFX_LIBS) -test-yarandom: test-yarandom.o - $(CC) -DTEST $(LDFLAGS) -o $@ test-yarandom.o $(UTILS_BIN)/yarandom.o +test-yarandom: test-yarandom.o blurb.o + $(CC) -DTEST $(LDFLAGS) -o $@ test-yarandom.o blurb.o $(UTILS_BIN)/yarandom.o +XDPY_DEFS = -DHAVE_GLX $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) +XDPY_LIBS = $(LIBS_PRE) -lGL -lX11 -lXext $(LIBS_POST) xdpyinfo.o: xdpyinfo.c - $(CC) -c $(INCLUDES) -DHAVE_GLX $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \ - $(srcdir)/xdpyinfo.c - + $(CC) -c $(INCLUDES) $(XDPY_DEFS) $(srcdir)/xdpyinfo.c xdpyinfo: xdpyinfo.o - $(CC) $(LDFLAGS) -o $@ xdpyinfo.o \ - $(LIBS) $(X_LIBS) @GL_LIBS@ \ - $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm - + $(CC) $(LDFLAGS) -o $@ xdpyinfo.o $(XDPY_LIBS) ############################################################################## # @@ -900,150 +996,89 @@ demo-Gtk-conf.o: ../config.h demo-Gtk-conf.o: $(srcdir)/demo-Gtk-conf.h demo-Gtk-conf.o: $(UTILS_SRC)/xscreensaver-intl.h demo-Gtk.o: XScreenSaver_ad.h +demo-Gtk.o: $(srcdir)/atoms.h +demo-Gtk.o: $(srcdir)/blurb.h demo-Gtk.o: ../config.h demo-Gtk.o: $(srcdir)/demo-Gtk-conf.h -demo-Gtk.o: $(srcdir)/prefs.h demo-Gtk.o: $(srcdir)/remote.h demo-Gtk.o: $(srcdir)/types.h demo-Gtk.o: $(UTILS_SRC)/resources.h demo-Gtk.o: $(UTILS_SRC)/usleep.h demo-Gtk.o: $(UTILS_SRC)/version.h demo-Gtk.o: $(UTILS_SRC)/visual.h +demo-Gtk.o: $(UTILS_SRC)/xmu.h demo-Gtk.o: $(UTILS_SRC)/xscreensaver-intl.h +demo-Xm.o: XScreenSaver_Xm_ad.h +demo-Xm.o: XScreenSaver_ad.h +demo-Xm.o: $(srcdir)/atoms.h +demo-Xm.o: $(srcdir)/blurb.h demo-Xm.o: ../config.h +demo-Xm.o: $(srcdir)/remote.h +demo-Xm.o: $(srcdir)/types.h +demo-Xm.o: $(UTILS_SRC)/resources.h +demo-Xm.o: $(UTILS_SRC)/version.h +demo-Xm.o: $(UTILS_SRC)/visual.h +demo-Xm.o: $(UTILS_SRC)/xmu.h demo-Xm-widgets.o: ../config.h -dpms.o: ../config.h -dpms.o: $(srcdir)/prefs.h -dpms.o: $(srcdir)/types.h -dpms.o: $(srcdir)/xscreensaver.h -exec.o: ../config.h -exec.o: $(srcdir)/exec.h -lock.o: $(srcdir)/auth.h -lock.o: ../config.h -lock.o: $(srcdir)/mlstring.h -lock.o: $(srcdir)/prefs.h -lock.o: $(srcdir)/types.h -lock.o: $(UTILS_SRC)/resources.h -lock.o: $(srcdir)/xscreensaver.h -mlstring.o: $(srcdir)/mlstring.h +passwd-helper.o: $(srcdir)/auth.h +passwd-helper.o: $(srcdir)/blurb.h passwd-helper.o: ../config.h -passwd-helper.o: $(srcdir)/prefs.h -passwd-helper.o: $(srcdir)/types.h -passwd-helper.o: $(srcdir)/xscreensaver.h +passwd-kerberos.o: $(srcdir)/auth.h +passwd-kerberos.o: $(srcdir)/blurb.h passwd-kerberos.o: ../config.h -passwd.o: $(srcdir)/auth.h -passwd.o: ../config.h -passwd.o: $(srcdir)/prefs.h -passwd.o: $(srcdir)/types.h -passwd.o: $(srcdir)/xscreensaver.h passwd-pam.o: $(srcdir)/auth.h +passwd-pam.o: $(srcdir)/blurb.h passwd-pam.o: ../config.h -passwd-pam.o: $(srcdir)/types.h +passwd-pwent.o: $(srcdir)/auth.h +passwd-pwent.o: $(srcdir)/blurb.h passwd-pwent.o: ../config.h -prefs.o: ../config.h -prefs.o: $(srcdir)/prefs.h -prefs.o: $(srcdir)/types.h -prefs.o: $(UTILS_SRC)/resources.h -prefs.o: $(UTILS_SRC)/version.h +remote.o: $(srcdir)/atoms.h +remote.o: $(srcdir)/blurb.h +remote.o: $(srcdir)/clientmsg.h remote.o: ../config.h remote.o: $(srcdir)/remote.h -screens.o: ../config.h -screens.o: $(srcdir)/prefs.h -screens.o: $(srcdir)/types.h -screens.o: $(UTILS_SRC)/visual.h -screens.o: $(srcdir)/xscreensaver.h -setuid.o: ../config.h -setuid.o: $(srcdir)/prefs.h -setuid.o: $(srcdir)/types.h -setuid.o: $(srcdir)/xscreensaver.h -splash.o: ../config.h -splash.o: $(srcdir)/prefs.h -splash.o: $(srcdir)/types.h -splash.o: $(UTILS_SRC)/font-retry.h -splash.o: $(UTILS_SRC)/resources.h -splash.o: $(srcdir)/xscreensaver.h -stderr.o: ../config.h -stderr.o: $(srcdir)/prefs.h -stderr.o: $(srcdir)/types.h -stderr.o: $(UTILS_SRC)/resources.h -stderr.o: $(UTILS_SRC)/visual.h -stderr.o: $(srcdir)/xscreensaver.h -subprocs.o: ../config.h -subprocs.o: $(srcdir)/exec.h -subprocs.o: $(srcdir)/prefs.h -subprocs.o: $(srcdir)/types.h -subprocs.o: $(UTILS_SRC)/visual.h -subprocs.o: $(UTILS_SRC)/yarandom.h -subprocs.o: $(srcdir)/xscreensaver.h -test-apm.o: ../config.h +test-fade.o: $(srcdir)/atoms.h +test-fade.o: $(srcdir)/blurb.h test-fade.o: ../config.h -test-fade.o: $(srcdir)/prefs.h +test-fade.o: $(srcdir)/fade.h +test-fade.o: $(srcdir)/screens.h test-fade.o: $(srcdir)/types.h -test-fade.o: $(UTILS_SRC)/fade.h +test-fade.o: $(UTILS_SRC)/resources.h test-fade.o: $(srcdir)/xscreensaver.h +test-grab.o: $(srcdir)/blurb.h test-grab.o: ../config.h -test-mlstring.o: $(srcdir)/mlstring.c -test-mlstring.o: $(srcdir)/mlstring.h -test-passwd.o: XScreenSaver_ad.h test-passwd.o: $(srcdir)/auth.h +test-passwd.o: $(srcdir)/blurb.h test-passwd.o: ../config.h -test-passwd.o: $(srcdir)/prefs.h -test-passwd.o: $(srcdir)/types.h -test-passwd.o: $(UTILS_SRC)/resources.h -test-passwd.o: $(UTILS_SRC)/version.h -test-passwd.o: $(UTILS_SRC)/visual.h -test-passwd.o: $(srcdir)/xscreensaver.h +test-randr.o: $(srcdir)/blurb.h test-randr.o: ../config.h +test-screens.o: $(srcdir)/blurb.h test-screens.o: ../config.h -test-screens.o: $(srcdir)/prefs.h -test-screens.o: $(srcdir)/screens.c -test-screens.o: $(srcdir)/types.h +test-screens.o: $(srcdir)/screens.h test-screens.o: $(UTILS_SRC)/visual.h -test-screens.o: $(srcdir)/xscreensaver.h test-uid.o: ../config.h +test-vp.o: $(srcdir)/blurb.h test-vp.o: ../config.h +test-xdpms.o: $(srcdir)/blurb.h test-xdpms.o: ../config.h +test-xinerama.o: $(srcdir)/blurb.h test-xinerama.o: ../config.h +test-xinput.o: $(srcdir)/blurb.h +test-xinput.o: ../config.h +test-xinput.o: $(srcdir)/xinput.h +test-xkb.o: $(srcdir)/blurb.h +test-xkb.o: ../config.h +test-yarandom.o: $(srcdir)/blurb.h test-yarandom.o: ../config.h test-yarandom.o: $(UTILS_SRC)/yarandom.h -timers.o: ../config.h -timers.o: $(srcdir)/prefs.h -timers.o: $(srcdir)/types.h -timers.o: $(srcdir)/xscreensaver.h -windows.o: ../config.h -windows.o: $(srcdir)/prefs.h -windows.o: $(srcdir)/types.h -windows.o: $(UTILS_SRC)/fade.h -windows.o: $(UTILS_SRC)/visual.h -windows.o: $(srcdir)/xscreensaver.h +xscreensaver-command.o: $(srcdir)/atoms.h +xscreensaver-command.o: $(srcdir)/blurb.h xscreensaver-command.o: ../config.h xscreensaver-command.o: $(srcdir)/remote.h xscreensaver-command.o: $(UTILS_SRC)/version.h -xscreensaver-getimage.o: ../config.h -xscreensaver-getimage.o: XScreenSaver_ad.h -xscreensaver-getimage.o: $(srcdir)/prefs.h -xscreensaver-getimage.o: $(srcdir)/types.h -xscreensaver-getimage.o: $(UTILS_SRC)/colorbars.h -xscreensaver-getimage.o: $(UTILS_SRC)/grabscreen.h -xscreensaver-getimage.o: $(UTILS_SRC)/resources.h -xscreensaver-getimage.o: $(UTILS_SRC)/utils.h -xscreensaver-getimage.o: $(UTILS_SRC)/version.h -xscreensaver-getimage.o: $(UTILS_SRC)/visual.h -xscreensaver-getimage.o: $(UTILS_SRC)/vroot.h -xscreensaver-getimage.o: $(UTILS_SRC)/yarandom.h -xscreensaver.o: XScreenSaver_ad.h -xscreensaver.o: $(srcdir)/auth.h -xscreensaver.o: ../config.h -xscreensaver.o: $(srcdir)/prefs.h -xscreensaver.o: $(srcdir)/types.h -xscreensaver.o: $(UTILS_SRC)/resources.h -xscreensaver.o: $(UTILS_SRC)/usleep.h -xscreensaver.o: $(UTILS_SRC)/version.h -xscreensaver.o: $(UTILS_SRC)/visual.h -xscreensaver.o: $(UTILS_SRC)/yarandom.h -xscreensaver.o: $(srcdir)/xscreensaver.h -xset.o: ../config.h -xset.o: $(srcdir)/prefs.h -xset.o: $(srcdir)/types.h -xset.o: $(srcdir)/xscreensaver.h +xscreensaver-systemd.o: $(srcdir)/blurb.h +xscreensaver-systemd.o: ../config.h +xscreensaver-systemd.o: $(UTILS_SRC)/queue.h +xscreensaver-systemd.o: $(UTILS_SRC)/version.h +xscreensaver-systemd.o: $(UTILS_SRC)/yarandom.h |