X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=e4bb969037e27283e6985934844344a60be0d9e9;hb=3210e7e80ee2b5a7d2049a5aaff9f17b9c93dcc9;hp=9c789a9f637f9d025dba865d693ca6c121f1f116;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;p=xscreensaver diff --git a/driver/Makefile.in b/driver/Makefile.in index 9c789a9f..e4bb9690 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -61,78 +61,102 @@ UTILS_BIN = ../utils INCLUDES = -I. -I$(srcdir) -I$(UTILS_SRC) -I.. @INCLUDES@ -PASSWD_LIBS = @PASSWD_LIBS@ MOTIF_SRCS = dialogs-Xm.c 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 = passwd-kerberos.c +KERBEROS_OBJS = passwd-kerberos.o + +PAM_SRCS = passwd-pam.c +PAM_OBJS = passwd-pam.o -KERBEROS_SRCS = kpasswd.c -KERBEROS_OBJS = kpasswd.o +LOCK_SRCS_1 = lock.c passwd.c +LOCK_OBJS_1 = lock.o passwd.o -LOCK_SRCS_1 = lock.c -LOCK_OBJS_1 = lock.o +TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c -TEST_SRCS = test-passwd.c test-uid.c +TOOLKIT_SRCS = @TOOLKIT_SRCS@ +TOOLKIT_OBJS = @TOOLKIT_OBJS@ +TOOLKIT_LIBS = @TOOLKIT_LIBS@ -DIALOG_SRCS = @DIALOG_SRCS@ -DIALOG_OBJS = @DIALOG_OBJS@ PASSWD_SRCS = @PASSWD_SRCS@ PASSWD_OBJS = @PASSWD_OBJS@ +PASSWD_LIBS = @PASSWD_LIBS@ + LOCK_SRCS = @LOCK_SRCS@ LOCK_OBJS = @LOCK_OBJS@ -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 @XMU_SRCS@ -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 @XMU_OBJS@ - -SAVER_SRCS_1 = demo.c stderr.c subprocs.c setuid.c timers.c windows.c \ - xscreensaver.c splash.c xset.c -SAVER_OBJS_1 = demo.o stderr.o subprocs.o setuid.o timers.o windows.o \ - xscreensaver.o splash.o xset.o - -SAVER_SRCS = $(SAVER_SRCS_1) $(DIALOG_SRCS) $(LOCK_SRCS) $(UTIL_SRCS) -SAVER_OBJS = $(SAVER_OBJS_1) $(DIALOG_OBJS) $(LOCK_OBJS) $(UTIL_OBJS) - -CMD_SRCS = xscreensaver-command.c -CMD_OBJS = xscreensaver-command.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 \ + xset.o splash.o setuid.o stderr.o + +SAVER_SRCS = $(SAVER_SRCS_1) prefs.c $(LOCK_SRCS) \ + $(SAVER_UTIL_SRCS) @XMU_SRCS@ +SAVER_OBJS = $(SAVER_OBJS_1) prefs.o $(LOCK_OBJS) \ + $(SAVER_UTIL_OBJS) @XMU_OBJS@ + +CMD_SRCS = remote.c xscreensaver-command.c +CMD_OBJS = remote.o xscreensaver-command.o + +DEMO_SRCS_1 = demo.c prefs.c +DEMO_OBJS_1 = demo.o prefs.o + +DEMO_SRCS = $(DEMO_SRCS_1) remote.c \ + $(TOOLKIT_SRCS) $(DEMO_UTIL_SRCS) +DEMO_OBJS = $(DEMO_OBJS_1) remote.o \ + $(TOOLKIT_OBJS) $(DEMO_UTIL_OBJS) SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ \ $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ $(PASSWD_LIBS) -CMD_LIBS = $(X_LIBS) $(X_PRE_LIBS) \ - -lX11 -lXext $(X_EXTRA_LIBS) \ - $(LIBS) +CMD_LIBS = $(LIBS) $(X_LIBS) \ + $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) + +DEMO_LIBS = $(LIBS) $(X_LIBS) $(TOOLKIT_LIBS) \ + $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) -EXES = xscreensaver xscreensaver-command +EXES = xscreensaver xscreensaver-command xscreensaver-demo -HDRS = XScreenSaver_ad.h xscreensaver.h -MEN = xscreensaver.man xscreensaver-command.man -EXTRAS = README Makefile.in XScreenSaver.ad.in dialogs.xd .gdbinit +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 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) $(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: @@ -157,13 +181,14 @@ install-program: $(EXES) $$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." ;\ + $$e " means that locking might not work. (Try it and see.)" ;\ $$e "" ;\ fi ; \ fi ; \ echo $$inst xscreensaver $(bindir)/xscreensaver ; \ $$inst xscreensaver $(bindir)/xscreensaver $(INSTALL_PROGRAM) xscreensaver-command $(bindir)/xscreensaver-command + $(INSTALL_PROGRAM) xscreensaver-demo $(bindir)/xscreensaver-demo install-ad: XScreenSaver.ad @if [ ! -d $(AD_DIR) ]; then $(INSTALL_DIRS) $(AD_DIR) ; fi @@ -195,6 +220,42 @@ 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=/etc/pam.d ; \ + conf=/etc/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 " 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 to work" ;\ + $$e " without this file (and old-style password authentication" ;\ + $$e " will be used instead, which may or may not work.)" ;\ + $$e "" ;\ + fi ; \ + elif [ -f $$conf ]; then \ + if ( grep $$dest $$conf >/dev/null ); then \ + true ; \ + else \ + e=echo ; \ + $$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 "" ;\ + cat $$src | grep -v '#%' | sed "s/^/ $$dest /" ; \ + echo ""; \ + fi ; \ + fi + + clean: -rm -f *.o a.out core $(EXES) XScreenSaver_ad.h @@ -218,7 +279,7 @@ distdepend: update_ad_version update_man_version XScreenSaver_ad.h -s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \ $(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) -- \ $(SAVER_SRCS_1) $(MOTIF_SRCS) $(ATHENA_SRCS) $(PWENT_SRCS) \ - $(LOCK_SRCS_1) $(CMD_SRCS) | \ + $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) $(TEST_SRCS) | \ ( \ awk '/^# .*Makefile.in ---/,/^# DO .*distdepend/' < Makefile.in ; \ sed -e 's@ \./@ @g;s@ /[^ ]*@@g;/^.*:$$/d' \ @@ -293,7 +354,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)" @@ -319,57 +380,121 @@ xscreensaver: $(SAVER_OBJS) xscreensaver-command: $(CMD_OBJS) $(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS) +xscreensaver-demo: $(DEMO_OBJS) + $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(DEMO_LIBS) -TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PWENT_OBJS) $(DIALOG_OBJS) \ - subprocs.o setuid.o demo.o \ - $(UTIL_OBJS) -test-passwd: $(TEST_PASSWD_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 $(CC) $(LDFLAGS) -o $@ $(TEST_PASSWD_OBJS) $(SAVER_LIBS) +test-uid: test-uid.o + $(CC) $(LDFLAGS) -o $@ test-uid.o + +test-xdpms: test-xdpms.o + $(CC) $(LDFLAGS) -o $@ test-xdpms.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. +# Normally it builds it with Motif if possible; this lets me build +# both. +# +xscreensaver-demo-Xaw: $(ATHENA_OBJS) demo-Xaw.o $(DEMO_OBJS) + $(CC) $(LDFLAGS) -o $@ demo-Xaw.o prefs.o remote.o \ + $(ATHENA_OBJS) $(DEMO_UTIL_OBJS) \ + $(LIBS) $(X_LIBS) -lXaw \ + $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) +xscreensaver-demo-Xaw3d: $(ATHENA_OBJS) demo-Xaw.o $(DEMO_OBJS) + $(CC) $(LDFLAGS) -o $@ demo-Xaw.o prefs.o remote.o \ + $(ATHENA_OBJS) $(DEMO_UTIL_OBJS) \ + $(LIBS) $(X_LIBS) -lXaw3d \ + $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) +demo-Xaw.o: demo.c XScreenSaver_ad.h + $(CC) -o $@ -c -DHAVE_ATHENA_KLUDGE \ + $(INCLUDES) $(DEFS2) $(CFLAGS) $(X_CFLAGS) $< + + + ############################################################################## # # DO NOT DELETE: updated by make distdepend # $(srcdir)/DO $(srcdir)/NOT $(srcdir)/DELETE: $(srcdir)/updated $(srcdir)/by $(srcdir)/make $(srcdir)/distdepend -demo.o: ../config.h -demo.o: $(srcdir)/xscreensaver.h -demo.o: $(UTILS_SRC)/resources.h -stderr.o: ../config.h -stderr.o: $(srcdir)/xscreensaver.h -stderr.o: $(UTILS_SRC)/resources.h -stderr.o: $(UTILS_SRC)/visual.h -subprocs.o: ../config.h -subprocs.o: $(srcdir)/xscreensaver.h -subprocs.o: $(UTILS_SRC)/yarandom.h -setuid.o: ../config.h -setuid.o: $(srcdir)/xscreensaver.h -timers.o: ../config.h -timers.o: $(srcdir)/xscreensaver.h -windows.o: ../config.h -windows.o: $(srcdir)/xscreensaver.h -windows.o: $(UTILS_SRC)/visual.h -windows.o: $(UTILS_SRC)/fade.h xscreensaver.o: ../config.h xscreensaver.o: $(srcdir)/xscreensaver.h +xscreensaver.o: $(srcdir)/prefs.h 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 -splash.o: ../config.h -splash.o: $(srcdir)/xscreensaver.h -splash.o: $(UTILS_SRC)/visual.h +windows.o: ../config.h +windows.o: $(srcdir)/xscreensaver.h +windows.o: $(srcdir)/prefs.h +windows.o: $(UTILS_SRC)/visual.h +windows.o: $(UTILS_SRC)/fade.h +timers.o: ../config.h +timers.o: $(srcdir)/xscreensaver.h +timers.o: $(srcdir)/prefs.h +subprocs.o: ../config.h +subprocs.o: $(srcdir)/xscreensaver.h +subprocs.o: $(srcdir)/prefs.h +subprocs.o: $(UTILS_SRC)/yarandom.h xset.o: ../config.h xset.o: $(srcdir)/xscreensaver.h +xset.o: $(srcdir)/prefs.h +splash.o: ../config.h +splash.o: $(srcdir)/xscreensaver.h +splash.o: $(srcdir)/prefs.h +splash.o: $(UTILS_SRC)/resources.h +setuid.o: ../config.h +setuid.o: $(srcdir)/xscreensaver.h +setuid.o: $(srcdir)/prefs.h +stderr.o: ../config.h +stderr.o: $(srcdir)/xscreensaver.h +stderr.o: $(srcdir)/prefs.h +stderr.o: $(UTILS_SRC)/resources.h +stderr.o: $(UTILS_SRC)/visual.h 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 +prefs.o: $(UTILS_SRC)/resources.h +remote.o: ../config.h +remote.o: $(srcdir)/remote.h xscreensaver-command.o: ../config.h +xscreensaver-command.o: $(srcdir)/remote.h xscreensaver-command.o: $(UTILS_SRC)/version.h +test-passwd.o: ../config.h +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