X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=7e101dbd70e2ca1e2bcaeb76d6f5617d8f790507;hb=c596d1306f5f92f7eab76224d3b049980a14adcb;hp=318ec69eb572b0a87f220eefe2c6d0ffdb9731c2;hpb=df7adbee81405e2849728a24b498ad2117784b1f;p=xscreensaver diff --git a/driver/Makefile.in b/driver/Makefile.in index 318ec69e..7e101dbd 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -83,6 +83,8 @@ PAM_OBJS = passwd-pam.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 TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c test-apm.c @@ -152,7 +154,7 @@ 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 + xscreensaver.kss .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 @@ -166,8 +168,8 @@ TARFILES = $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) \ default: $(EXES) all: $(EXES) $(EXES2) -install: install-program install-ad install-man @INSTALL_PAM@ -uninstall: uninstall-program uninstall-ad uninstall-man +install: install-program install-ad install-kde install-man @INSTALL_PAM@ +uninstall: uninstall-program uninstall-ad uninstall-kde uninstall-man install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \ @@ -302,6 +304,40 @@ install-pam: fi ; \ fi +install-kde: + @src="$(srcdir)/xscreensaver.kss" ; \ + if [ "$$KDEDIR" != "" ]; then \ + dir="$$KDEDIR/bin" ; \ + dest="$$dir/xscreensaver.kss" ; \ + echo $(INSTALL_PROGRAM) $$src $$dest ; \ + if $(INSTALL_PROGRAM) $$src $$dest ; then \ + true ; \ + else \ + e=echo ; \ + $$e "" ;\ + $$e " ####################################################################";\ + $$e " Warning: unable to install $$dest" ;\ + if [ ! -d $$KDEDIR ]; then \ + $$e " $$KDEDIR (\$$KDEDIR) does not exist." ;\ + elif [ ! -d $$KDEDIR/bin ]; then \ + $$e " $$KDEDIR/bin (\$$KDEDIR/bin) does not exist." ;\ + elif [ -f $$dest ]; then \ + $$e " That file exists, and is unwritable." ;\ + else \ + $$e " The directory is unwritable." ;\ + fi ;\ + $$e " ####################################################################";\ + $$e "" ;\ + exit 1 ; \ + fi ; \ + fi + +uninstall-kde: + @if [ "$$KDEDIR" != "" ]; then \ + dest="$$KDEDIR/bin/xscreensaver.kss" ; \ + echo rm -f $$dest ; \ + rm -f $$dest ; \ + fi clean: -rm -f *.o a.out core $(EXES) $(EXES2) XScreenSaver_ad.h