X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=0187e2172b6773762c86a92fe2f4858bb6dcc191;hb=551b3de3f619c04c2dd1971ee9b3f02e270c28c9;hp=a5ad371204de185e7fe654359852a7b95f837489;hpb=c31d10b6605cd8dc1a7b61fef4256f06198767e5;p=xscreensaver diff --git a/driver/Makefile.in b/driver/Makefile.in index a5ad3712..0187e217 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -55,6 +55,8 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ AD_DIR = @APPDEFAULTS@ +PAM_DIR = /etc/pam.d +PAM_CONF = /etc/pam.conf UTILS_SRC = $(srcdir)/../utils UTILS_BIN = ../utils @@ -67,16 +69,19 @@ MOTIF_OBJS = dialogs-Xm.o ATHENA_SRCS = dialogs-Xaw.c ATHENA_OBJS = dialogs-Xaw.o -PWENT_SRCS = passwd.c -PWENT_OBJS = passwd.o +PWENT_SRCS = passwd-pwent.c +PWENT_OBJS = passwd-pwent.o -KERBEROS_SRCS = kpasswd.c -KERBEROS_OBJS = kpasswd.o +KERBEROS_SRCS = passwd-kerberos.c +KERBEROS_OBJS = passwd-kerberos.o -LOCK_SRCS_1 = lock.c -LOCK_OBJS_1 = lock.o +PAM_SRCS = passwd-pam.c +PAM_OBJS = passwd-pam.o -TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c +LOCK_SRCS_1 = lock.c passwd.c +LOCK_OBJS_1 = lock.o passwd.o + +TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c TOOLKIT_SRCS = @TOOLKIT_SRCS@ TOOLKIT_OBJS = @TOOLKIT_OBJS@ @@ -89,20 +94,20 @@ PASSWD_LIBS = @PASSWD_LIBS@ LOCK_SRCS = @LOCK_SRCS@ LOCK_OBJS = @LOCK_OBJS@ -SAVER_UTIL_SRCS = $(UTILS_SRC)/fade.c $(UTILS_SRC)/overlay.c \ - $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \ - $(UTILS_SRC)/visual.c $(UTILS_SRC)/xroger.c \ - $(UTILS_SRC)/spline.c $(UTILS_SRC)/yarandom.c -SAVER_UTIL_OBJS = $(UTILS_BIN)/fade.o $(UTILS_BIN)/overlay.o \ - $(UTILS_BIN)/resources.o $(UTILS_BIN)/usleep.o \ - $(UTILS_BIN)/visual.o $(UTILS_BIN)/xroger.o \ - $(UTILS_BIN)/spline.o $(UTILS_BIN)/yarandom.o - DEMO_UTIL_SRCS = $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \ $(UTILS_SRC)/visual.c DEMO_UTIL_OBJS = $(UTILS_BIN)/resources.o $(UTILS_BIN)/usleep.o \ $(UTILS_BIN)/visual.o +SAVER_UTIL_SRCS = $(UTILS_SRC)/fade.c $(UTILS_SRC)/overlay.c \ + $(UTILS_SRC)/xroger.c $(UTILS_SRC)/spline.c \ + $(UTILS_SRC)/yarandom.c \ + $(DEMO_UTIL_SRCS) +SAVER_UTIL_OBJS = $(UTILS_BIN)/fade.o $(UTILS_BIN)/overlay.o \ + $(UTILS_BIN)/xroger.o $(UTILS_BIN)/spline.o \ + $(UTILS_BIN)/yarandom.o \ + $(DEMO_UTIL_OBJS) + SAVER_SRCS_1 = xscreensaver.c windows.c timers.c subprocs.c \ xset.c splash.c setuid.c stderr.c SAVER_OBJS_1 = xscreensaver.o windows.o timers.o subprocs.o \ @@ -139,20 +144,21 @@ EXES = xscreensaver xscreensaver-command xscreensaver-demo HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h MEN = xscreensaver.man xscreensaver-demo.man \ xscreensaver-command.man -EXTRAS = README Makefile.in XScreenSaver.ad.in dialogs.xd .gdbinit +EXTRAS = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \ + .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) \ $(MOTIF_SRCS) $(ATHENA_SRCS) $(PWENT_SRCS) $(KERBEROS_SRCS) \ - $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) $(HDRS) \ - $(TEST_SRCS) $(MEN) + $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) \ + $(HDRS) $(TEST_SRCS) $(MEN) all: $(EXES) -install: install-program install-ad install-man +install: install-program install-ad install-man @INSTALL_PAM@ uninstall: uninstall-program uninstall-ad uninstall-man install-strip: @@ -170,6 +176,7 @@ install-program: $(EXES) 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" ;\ @@ -178,6 +185,7 @@ install-program: $(EXES) $$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 ; \ @@ -188,7 +196,32 @@ install-program: $(EXES) install-ad: XScreenSaver.ad @if [ ! -d $(AD_DIR) ]; then $(INSTALL_DIRS) $(AD_DIR) ; fi - $(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver + @-echo $(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver ; \ + if $(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver ; then \ + true ; \ + else \ + e=echo ; \ + if [ -f $(AD_DIR)/XScreenSaver ]; then \ + $$e "" ;\ + $$e " ####################################################################";\ + $$e " Warning: unable to install $(AD_DIR)/XScreenSaver" ;\ + $$e " That file exists, and is unwritable. It is probably from" ;\ + $$e " an older version of xscreensaver, and could cause things" ;\ + $$e " to malfunction. Please delete it!" ;\ + $$e " ####################################################################";\ + $$e "" ;\ + exit 1 ; \ + else \ + $$e "" ;\ + $$e " ####################################################################";\ + $$e " Warning: unable to install $(AD_DIR)/XScreenSaver" ;\ + $$e " The directory is unwritable. This is probably ok;" ;\ + $$e " xscreensaver should work without that file." ;\ + $$e " ####################################################################";\ + $$e "" ;\ + exit 0 ; \ + fi \ + fi install-man: $(MEN) @men="$(MEN)" ; \ @@ -216,6 +249,47 @@ uninstall-man: rm -f $(man1dir)/$$instname ; \ done +install-pam: + @src="$(srcdir)/xscreensaver.pam" ; \ + dest=`sed -n 's/.*PAM_SERVICE_NAME[ ]*"\([^"]*\)".*$$/\1/p' \ + < ../config.h` ; \ + dir="$(PAM_DIR)" ; \ + conf="$(PAM_CONF)" ; \ + \ + if [ -d $$dir ] ; then \ + echo $(INSTALL_DATA) $$src $$dir/$$dest ; \ + $(INSTALL_DATA) $$src $$dir/$$dest ; \ + if [ ! -f $$dir/$$dest ]; 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 " ####################################################################";\ + $$e "" ;\ + fi ; \ + elif [ -f $$conf ]; then \ + if ( grep $$dest $$conf >/dev/null ); then \ + true ; \ + else \ + e=echo ; \ + $$e "" ;\ + $$e " ####################################################################";\ + $$e " Warning: xscreensaver has been compiled with support for Pluggable" ;\ + $$e " Authentication Modules (PAM). To complete the installation";\ + $$e " of PAM support, you must add this to the file $$conf:" ;\ + $$e " ####################################################################";\ + $$e "" ;\ + cat $$src | grep -v '#%' | sed "s/^/ $$dest /" ; \ + echo ""; \ + fi ; \ + fi + + clean: -rm -f *.o a.out core $(EXES) XScreenSaver_ad.h @@ -314,7 +388,7 @@ $(UTILS_BIN)/xroger.o: $(UTILS_SRC)/xroger.c $(UTILS_BIN)/spline.o: $(UTILS_SRC)/spline.c $(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c -$(UTIL_OBJS): +$(SAVER_UTIL_OBJS): cd $(UTILS_BIN) ; \ $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" @@ -345,9 +419,9 @@ xscreensaver-demo: $(DEMO_OBJS) -TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PWENT_OBJS) $(TOOLKIT_OBJS) \ - subprocs.o setuid.o demo.o splash.o prefs.o \ - $(UTIL_OBJS) +TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \ + subprocs.o setuid.o splash.o prefs.o \ + $(SAVER_UTIL_OBJS) test-passwd.o: XScreenSaver_ad.h test-passwd: $(TEST_PASSWD_OBJS) XScreenSaver_ad.h @@ -359,6 +433,9 @@ test-uid: test-uid.o test-xdpms: test-xdpms.o $(CC) $(LDFLAGS) -o $@ test-xdpms.o $(SAVER_LIBS) +test-grab: test-grab.o + $(CC) $(LDFLAGS) -o $@ test-grab.o $(SAVER_LIBS) + # This kludge is so that I can build/test the Athena version of the # xscreensaver-demo program without having to re-run configure. @@ -393,6 +470,7 @@ xscreensaver.o: $(UTILS_SRC)/version.h xscreensaver.o: $(UTILS_SRC)/yarandom.h xscreensaver.o: $(UTILS_SRC)/resources.h xscreensaver.o: $(UTILS_SRC)/visual.h +xscreensaver.o: $(UTILS_SRC)/usleep.h xscreensaver.o: XScreenSaver_ad.h windows.o: ../config.h windows.o: $(srcdir)/xscreensaver.h @@ -425,17 +503,19 @@ dialogs-Xm.o: ../config.h dialogs-Xm.o: $(UTILS_SRC)/visual.h dialogs-Xaw.o: ../config.h dialogs-Xaw.o: $(UTILS_SRC)/visual.h -passwd.o: ../config.h +passwd-pwent.o: ../config.h lock.o: ../config.h lock.o: $(srcdir)/xscreensaver.h lock.o: $(srcdir)/prefs.h lock.o: $(UTILS_SRC)/resources.h +passwd.o: ../config.h demo.o: ../config.h demo.o: $(UTILS_SRC)/version.h demo.o: $(srcdir)/prefs.h demo.o: $(UTILS_SRC)/resources.h demo.o: $(UTILS_SRC)/visual.h demo.o: $(srcdir)/remote.h +demo.o: $(UTILS_SRC)/usleep.h demo.o: XScreenSaver_ad.h prefs.o: ../config.h prefs.o: $(srcdir)/prefs.h @@ -450,7 +530,9 @@ test-passwd.o: $(srcdir)/xscreensaver.h test-passwd.o: $(srcdir)/prefs.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: XScreenSaver_ad.h test-uid.o: ../config.h test-xdpms.o: ../config.h +test-grab.o: ../config.h