X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=787a97211d6e0edbbbf66a53f933ce48b4c08ce8;hb=82c5080773aae5e72ec155327c075775e023d2ee;hp=68a676fb34c75c63af72ca1474b9c419a5fa4824;hpb=278c59e14c53fd412b734e699bd4f314f766f804;p=xscreensaver diff --git a/driver/Makefile.in b/driver/Makefile.in index 68a676fb..787a9721 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -1,4 +1,4 @@ -# driver/Makefile.in --- xscreensaver, Copyright (c) 1997 Jamie Zawinski. +# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-1999 Jamie Zawinski. # the `../configure' script generates `driver/Makefile' from this file. @SET_MAKE@ @@ -16,6 +16,12 @@ mandir = @mandir@ man1dir = $(mandir)/man1 mansuffix = 1 +GNOME_DATADIR = @GNOME_DATADIR@ +GNOME_CCDIR = $(GNOME_DATADIR)/control-center/Desktop +GNOME_PANELDIR = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop +GNOME_ICONDIR = $(GNOME_DATADIR)/pixmaps +GNOME_BINDIR = $(bindir) + CC = @CC@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ @@ -31,6 +37,7 @@ SHELL = /bin/sh INSTALL = @INSTALL@ SUID_FLAGS = -o root -m 4755 INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SETUID = @INSTALL_SETUID@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIRS = @INSTALL_DIRS@ @@ -63,11 +70,11 @@ UTILS_BIN = ../utils INCLUDES = -I. -I$(srcdir) -I$(UTILS_SRC) -I.. @INCLUDES@ -MOTIF_SRCS = dialogs-Xm.c -MOTIF_OBJS = dialogs-Xm.o +MOTIF_SRCS = demo-Xm.c demo-Xm-widgets.c +MOTIF_OBJS = demo-Xm.o demo-Xm-widgets.o -ATHENA_SRCS = dialogs-Xaw.c -ATHENA_OBJS = dialogs-Xaw.o +GTK_SRCS = demo-Gtk.c demo-Gtk-widgets.c +GTK_OBJS = demo-Gtk.o demo-Gtk-widgets.o PWENT_SRCS = passwd-pwent.c PWENT_OBJS = passwd-pwent.o @@ -80,12 +87,18 @@ 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 xdpyinfo.c +TEST_EXES = test-passwd test-uid test-xdpms test-grab \ + test-apm xdpyinfo -TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c +MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@ +GTK_LIBS = @GTK_LIBS@ -TOOLKIT_SRCS = @TOOLKIT_SRCS@ -TOOLKIT_OBJS = @TOOLKIT_OBJS@ -TOOLKIT_LIBS = @TOOLKIT_LIBS@ +XDPMS_LIBS = @XDPMS_LIBS@ PASSWD_SRCS = @PASSWD_SRCS@ PASSWD_OBJS = @PASSWD_OBJS@ @@ -101,17 +114,18 @@ GL_SRCS = @SAVER_GL_SRCS@ GL_OBJS = @SAVER_GL_OBJS@ GL_LIBS = @SAVER_GL_LIBS@ +LOGO = $(UTILS_SRC)/logo-50.xpm 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)/logo.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)/logo.o $(UTILS_BIN)/spline.o \ $(UTILS_BIN)/yarandom.o \ $(DEMO_UTIL_OBJS) @@ -120,53 +134,59 @@ SAVER_SRCS_1 = xscreensaver.c windows.c timers.c subprocs.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_SRCS = $(SAVER_SRCS_1) prefs.c dpms.c $(LOCK_SRCS) \ $(SAVER_UTIL_SRCS) $(GL_SRCS) $(XMU_SRCS) -SAVER_OBJS = $(SAVER_OBJS_1) prefs.o $(LOCK_OBJS) \ +SAVER_OBJS = $(SAVER_OBJS_1) prefs.o dpms.o $(LOCK_OBJS) \ $(SAVER_UTIL_OBJS) $(GL_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_1 = prefs.c dpms.c $(XMU_SRCS) +DEMO_OBJS_1 = prefs.o dpms.o $(XMU_OBJS) -DEMO_SRCS = $(DEMO_SRCS_1) remote.c \ - $(TOOLKIT_SRCS) $(DEMO_UTIL_SRCS) -DEMO_OBJS = $(DEMO_OBJS_1) remote.o \ - $(TOOLKIT_OBJS) $(DEMO_UTIL_OBJS) +DEMO_SRCS = prefs.c dpms.c remote.c $(DEMO_UTIL_SRCS) +DEMO_OBJS = prefs.o dpms.o remote.o $(DEMO_UTIL_OBJS) -SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) \ +SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(XDPMS_LIBS) $(GL_LIBS) \ $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ $(PASSWD_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 xscreensaver-demo +EXES2 = @ALL_DEMO_PROGRAMS@ -HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h +HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \ + demo-Gtk-widgets.h demo-Gtk-stubs.h MEN = xscreensaver.man xscreensaver-demo.man \ xscreensaver-command.man +ALL_MEN = xscreensaver.man \ + xscreensaver-demo.man xscreensaver-command.man EXTRAS = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \ + xscreensaver.kss xscreensaver-demo.glade \ + screensaver-properties.desktop.in \ + screensaver-properties-capplet \ .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) \ - $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) \ - $(HDRS) $(TEST_SRCS) $(MEN) + $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) \ + $(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \ + $(CMD_SRCS) $(HDRS) $(TEST_SRCS) $(ALL_MEN) -all: $(EXES) +default: $(EXES) +all: $(EXES) $(EXES2) +tests: $(TEST_EXES) -install: install-program install-ad install-man @INSTALL_PAM@ -uninstall: uninstall-program uninstall-ad uninstall-man +install: install-program install-ad install-gnome install-kde \ + install-man @INSTALL_PAM@ +uninstall: uninstall-program uninstall-ad uninstall-gnome uninstall-kde \ + uninstall-man install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \ @@ -174,10 +194,12 @@ install-strip: install install-program: $(EXES) - @if [ ! -d $(bindir) ]; then $(INSTALL_DIRS) $(bindir) ; fi + @if [ ! -d $(install_prefix)$(bindir) ]; then \ + $(INSTALL_DIRS) $(install_prefix)$(bindir) ; \ + fi @inst="$(INSTALL_PROGRAM)" ; \ if [ @NEED_SETUID@ = yes ]; then \ - me="`whoami`" ; \ + me=`PATH="$$PATH:/usr/ucb" whoami` ; \ if [ "$$me" = root ]; then \ inst="$(INSTALL_SETUID)" ; \ else \ @@ -194,24 +216,34 @@ install-program: $(EXES) $$e " means that locking might not work. (Try it and see.)" ;\ $$e " ####################################################################";\ $$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 + fi ; \ + fi ; \ + echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ + $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver + @echo $(INSTALL_PROGRAM) xscreensaver-command \ + $(install_prefix)$(bindir)/xscreensaver-command ; \ + $(INSTALL_PROGRAM) xscreensaver-command \ + $(install_prefix)$(bindir)/xscreensaver-command + @echo $(INSTALL_PROGRAM) xscreensaver-demo \ + $(install_prefix)$(bindir)/xscreensaver-demo ; \ + $(INSTALL_PROGRAM) xscreensaver-demo \ + $(install_prefix)$(bindir)/xscreensaver-demo install-ad: XScreenSaver.ad - @if [ ! -d $(AD_DIR) ]; then $(INSTALL_DIRS) $(AD_DIR) ; fi - @-echo $(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver ; \ - if $(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver ; then \ + @if [ ! -d $(install_prefix)$(AD_DIR) ]; then \ + $(INSTALL_DIRS) $(install_prefix)$(AD_DIR) ; \ + fi + @-echo $(INSTALL_DATA) XScreenSaver.ad \ + $(install_prefix)$(AD_DIR)/XScreenSaver ; \ + if $(INSTALL_DATA) XScreenSaver.ad \ + $(install_prefix)$(AD_DIR)/XScreenSaver ; then \ true ; \ else \ e=echo ; \ - if [ -f $(AD_DIR)/XScreenSaver ]; then \ + if [ -f $(install_prefix)$(AD_DIR)/XScreenSaver ]; then \ $$e "" ;\ $$e " ####################################################################";\ - $$e " Warning: unable to install $(AD_DIR)/XScreenSaver" ;\ + $$e " Warning: unable to install $(install_prefix)$(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!" ;\ @@ -221,7 +253,7 @@ install-ad: XScreenSaver.ad else \ $$e "" ;\ $$e " ####################################################################";\ - $$e " Warning: unable to install $(AD_DIR)/XScreenSaver" ;\ + $$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 " ####################################################################";\ @@ -232,40 +264,62 @@ install-ad: XScreenSaver.ad install-man: $(MEN) @men="$(MEN)" ; \ - if [ ! -d $(man1dir) ]; then $(INSTALL_DIRS) $(man1dir) ; fi ; \ + if [ ! -d $(install_prefix)$(man1dir) ]; then \ + $(INSTALL_DIRS) $(install_prefix)$(man1dir) ; \ + fi ; \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ - echo $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ; \ - $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ; \ + echo $(INSTALL_DATA) $(srcdir)/$$man \ + $(install_prefix)$(man1dir)/$$instname ; \ + $(INSTALL_DATA) $(srcdir)/$$man \ + $(install_prefix)$(man1dir)/$$instname ; \ done uninstall-program: @for program in $(EXES); do \ - echo rm -f $(bindir)/$$program ; \ - rm -f $(bindir)/$$program ; \ + echo rm -f $(install_prefix)$(bindir)/$$program ; \ + rm -f $(install_prefix)$(bindir)/$$program ; \ done uninstall-ad: - rm -f $(AD_DIR)/XScreenSaver + rm -f $(install_prefix)$(AD_DIR)/XScreenSaver uninstall-man: @men="$(MEN)" ; \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ - echo rm -f $(man1dir)/$$instname ; \ - rm -f $(man1dir)/$$instname ; \ + echo rm -f $(install_prefix)$(man1dir)/$$instname ; \ + rm -f $(install_prefix)$(man1dir)/$$instname ; \ done install-pam: @src="$(srcdir)/xscreensaver.pam" ; \ dest=`sed -n 's/.*PAM_SERVICE_NAME[ ]*"\([^"]*\)".*$$/\1/p' \ < ../config.h` ; \ - dir="$(PAM_DIR)" ; \ + dir="$(install_prefix)$(PAM_DIR)" ; \ conf="$(PAM_CONF)" ; \ \ if [ -d $$dir ] ; then \ - echo $(INSTALL_DATA) $$src $$dir/$$dest ; \ - $(INSTALL_DATA) $$src $$dir/$$dest ; \ + \ + if [ -f $$dir/xdm ]; then \ + src2=$$dir/xdm ; \ + elif [ -f $$dir/login ]; then \ + src2=$$dir/login ; \ + fi ; \ + \ + if [ -z "$$src2" ]; then \ + echo $(INSTALL_DATA) $$src $$dir/$$dest ; \ + $(INSTALL_DATA) $$src $$dir/$$dest ; \ + else \ + src="xscreensaver.pam.$$$$" ; \ + echo "grep '^#%\|^auth' $$src2 > $$src" ; \ + grep '^#%\|^auth' $$src2 > $$src ; \ + echo $(INSTALL_DATA) $$src $$dir/$$dest ; \ + $(INSTALL_DATA) $$src $$dir/$$dest ; \ + echo rm -f $$src ; \ + rm -f $$src ; \ + fi ; \ + \ if [ ! -f $$dir/$$dest ]; then \ e=echo ; \ $$e "" ;\ @@ -288,17 +342,175 @@ install-pam: $$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 " of PAM support, you must add the following line to the file";\ + $$e " $$conf:" ;\ $$e "" ;\ - cat $$src | grep -v '#%' | sed "s/^/ $$dest /" ; \ + $$e " $$dest auth required /usr/lib/security/pam_unix.so.1" ;\ + $$e "" ;\ + $$e " Be careful: if you mess up that file, you could completely" ;\ + $$e " hose your machine (e.g., \`login' and \`su' won't work, and";\ + $$e " you'll have to boot single-user to fix it.)" ;\ + $$e " ####################################################################";\ echo ""; \ fi ; \ fi +install-gnome:: screensaver-properties.desktop + @lost1="" ;\ + lost2="" ;\ + if [ "$(GNOME_DATADIR)" != "" ]; then \ + \ + if [ ! -d "$(install_prefix)$(GNOME_CCDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)" ;\ + fi ;\ + \ + echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ + $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop ;\ + \ + if $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ + $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop ;\ + then true ;\ + else \ + lost1="$(install_prefix)$(GNOME_CCDIR)" ;\ + fi ;\ + \ + if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)" ;\ + fi ;\ + \ + echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ + $(GNOME_PANELDIR)/screensaver-properties.desktop ;\ + if $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ + $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop ;\ + then true ;\ + else \ + lost2="$(install_prefix)$(GNOME_PANELDIR)" ;\ + fi ;\ + \ + if [ "$$lost1" != "" -o "$$lost2" != "" ]; then \ + e=echo ; \ + $$e "" ;\ + $$e " ####################################################################";\ + $$e " Warning: unable to install screensaver-properties.desktop into" ;\ + plurality="this file" ;\ + if [ "$$lost1" != "" -a "$$lost2" != "" ]; then \ + $$e " $$lost1/ or into" ;\ + $$e " $$lost2/." ;\ + plurality="these files" ;\ + elif [ "$$lost1" != "" ]; then \ + $$e " $$lost1/." ;\ + else \ + $$e " $$lost2/." ;\ + fi ;\ + $$e " Without $$plurality," 'the "Screen Saver" section of the' ;\ + $$e " Gnome Control Center (gnomecc) will not work properly." ;\ + $$e " ####################################################################";\ + $$e "" ;\ + exit 1 ; \ + fi ;\ + fi + +install-gnome:: screensaver-properties-capplet + @if [ "$(GNOME_DATADIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)" ;\ + fi ;\ + program=screensaver-properties-capplet ;\ + echo $(INSTALL_SCRIPT) $$program \ + $(install_prefix)$(GNOME_BINDIR)/$$program ;\ + if $(INSTALL_SCRIPT) $$program \ + $(install_prefix)$(GNOME_BINDIR)/$$program ;\ + then true ;\ + else \ + e=echo ; \ + $$e "" ;\ + $$e " ####################################################################";\ + $$e " Warning: unable to install $$program into" ;\ + $$e " $(install_prefix)$(GNOME_BINDIR)/." ;\ + $$e " Without this file, the Gnome session manager will not" ;\ + $$e " launch xscreensaver properly at login time." ;\ + $$e " ####################################################################";\ + $$e "" ;\ + exit 1 ; \ + fi ; \ + fi + +install-gnome:: $(LOGO) + @if [ "$(GNOME_DATADIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GNOME_ICONDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_ICONDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GNOME_ICONDIR)" ;\ + fi ;\ + target=xscreensaver.xpm ;\ + echo $(INSTALL_DATA) $(LOGO) \ + $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ + $(INSTALL_DATA) $(LOGO) \ + $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ + fi + +uninstall-gnome:: + @if [ "$(GNOME_DATADIR)" != "" ]; then \ + f=screensaver-properties.desktop ;\ + echo rm -f $(install_prefix)$(GNOME_CCDIR)/$$f ;\ + rm -f $(install_prefix)$(GNOME_CCDIR)/$$f ;\ + echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f ;\ + rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f ;\ + fi + +uninstall-gnome:: + @if [ "$(GNOME_DATADIR)" != "" ]; then \ + program=screensaver-properties-capplet ;\ + echo rm -f $(install_prefix)$(bindir)/$$program ;\ + rm -f $(install_prefix)$(bindir)/$$program ;\ + fi + +uninstall-gnome:: + @if [ "$(GNOME_DATADIR)" != "" ]; then \ + target=xscreensaver.xpm ;\ + echo rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ + rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ + fi + +install-kde: + @src="$(srcdir)/xscreensaver.kss" ; \ + if [ "$$KDEDIR" != "" ]; then \ + dir="$(install_prefix)$$KDEDIR/bin" ; \ + dest="$$dir/xscreensaver.kss" ; \ + echo $(INSTALL_SCRIPT) $$src $$dest ; \ + if $(INSTALL_SCRIPT) $$src $$dest ; then \ + true ; \ + else \ + e=echo ; \ + $$e "" ;\ + $$e " ####################################################################";\ + $$e " Warning: unable to install $$dest" ;\ + if [ ! -d $(install_prefix)$$KDEDIR ]; then \ + $$e " $(install_prefix)$$KDEDIR (\$$KDEDIR) does not exist." ;\ + elif [ ! -d $(install_prefix)$$KDEDIR/bin ]; then \ + $$e " $(install_prefix)$$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="$(install_prefix)$$KDEDIR/bin/xscreensaver.kss" ; \ + echo rm -f $$dest ; \ + rm -f $$dest ; \ + fi clean: - -rm -f *.o a.out core $(EXES) XScreenSaver_ad.h + -rm -f *.o a.out core $(EXES) $(EXES2) $(TEST_EXES) XScreenSaver_ad.h distclean: clean -rm -f Makefile XScreenSaver.ad TAGS *~ "#"* @@ -319,8 +531,9 @@ distdepend: update_ad_version update_man_version XScreenSaver_ad.h $(DEPEND) -w 0 -f - \ -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) $(DEMO_SRCS_1) $(CMD_SRCS) $(TEST_SRCS) | \ + $(SAVER_SRCS_1) $(MOTIF_SRCS) $(GTK_SRCS) \ + $(PWENT_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' \ @@ -340,11 +553,11 @@ update_ad_version:: @S=XScreenSaver.ad.in ; \ U=$(UTILS_SRC)/version.h ; \ V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ; \ - D=`date '+%d-%b-%y'` ; \ + D=`date '+%d-%b-%Y'` ; \ echo -n "Updating version number in $$S to $$V $$D... " ; \ T=/tmp/xs.$$$$ ; \ sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*\(.*\)/\1$$V\2/" \ - -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9]\)/$$D/" \ + -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/" \ < $$S > $$T ; \ if cmp -s $$S $$T ; then \ echo "unchanged." ; \ @@ -358,7 +571,7 @@ update_man_version:: @for S in $(MEN); do \ U=$(UTILS_SRC)/version.h ; \ V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ; \ - V="`date '+%d-%b-%y'` ($$V)" ; \ + V="`date '+%d-%b-%Y'` ($$V)" ; \ echo -n "Updating footer in $$S to \"$$V\"... " ; \ T=/tmp/xs.$$$$ ; \ sed "s/^\(\.TH[^\"]*\)\"[^\"]*\"\(.*\)/\1\"$$V\"\2/" \ @@ -391,7 +604,7 @@ $(UTILS_BIN)/resources.o: $(UTILS_SRC)/resources.c $(UTILS_BIN)/usleep.o: $(UTILS_SRC)/usleep.c $(UTILS_BIN)/visual.o: $(UTILS_SRC)/visual.c $(UTILS_BIN)/xmu.o: $(UTILS_SRC)/xmu.c -$(UTILS_BIN)/xroger.o: $(UTILS_SRC)/xroger.c +$(UTILS_BIN)/logo.o: $(UTILS_SRC)/logo.c $(UTILS_BIN)/spline.o: $(UTILS_SRC)/spline.c $(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c @@ -405,7 +618,8 @@ $(SAVER_UTIL_OBJS): # subprocs is the only one that takes an extra -D option. subprocs.o: subprocs.c - $(CC) -c $(INCLUDES) $(DEFS2) $(CFLAGS) $(X_CFLAGS) $< + $(CC) -c $(INCLUDES) $(DEFS2) $(CFLAGS) $(X_CFLAGS) \ + $(srcdir)/subprocs.c # How we build the default app-defaults file into the program. @@ -413,6 +627,12 @@ subprocs.o: subprocs.c XScreenSaver_ad.h: XScreenSaver.ad $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver.ad > XScreenSaver_ad.h +screensaver-properties.desktop: screensaver-properties.desktop.in Makefile + @echo generating $@... ; \ + sed "s%[@]bindir[@]%${bindir}%g" \ + < ${srcdir}/screensaver-properties.desktop.in \ + > $@ + # The executables linked in this directory. # xscreensaver: $(SAVER_OBJS) @@ -421,8 +641,19 @@ 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) + +xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@ + cp -p @PREFERRED_DEMO_PROGRAM@ $@ + +xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) + $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \ + $(MOTIF_LIBS) $(X_PRE_LIBS) -lXt -lX11 $(XDPMS_LIBS) -lXext \ + $(X_EXTRA_LIBS) + +xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS) + $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \ + $(GTK_LIBS) $(X_PRE_LIBS) -lXt -lX11 $(XDPMS_LIBS) -lXext \ + $(X_EXTRA_LIBS) @@ -438,31 +669,24 @@ test-uid: test-uid.o $(CC) $(LDFLAGS) -o $@ test-uid.o test-xdpms: test-xdpms.o - $(CC) $(LDFLAGS) -o $@ test-xdpms.o $(SAVER_LIBS) + $(CC) $(LDFLAGS) -o $@ test-xdpms.o $(LIBS) $(X_LIBS) $(XDPMS_LIBS) \ + $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) test-grab: test-grab.o $(CC) $(LDFLAGS) -o $@ test-grab.o $(SAVER_LIBS) +test-apm: test-apm.o + $(CC) $(LDFLAGS) -o $@ test-apm.o $(SAVER_LIBS) -lapm -# 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) $< +xdpyinfo.o: xdpyinfo.c + $(CC) -c $(INCLUDES) -DHAVE_GLX $(CFLAGS) $(X_CFLAGS) \ + $(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 ############################################################################## @@ -491,6 +715,7 @@ subprocs.o: ../config.h subprocs.o: $(srcdir)/xscreensaver.h subprocs.o: $(srcdir)/prefs.h subprocs.o: $(UTILS_SRC)/yarandom.h +subprocs.o: $(UTILS_SRC)/visual.h xset.o: ../config.h xset.o: $(srcdir)/xscreensaver.h xset.o: $(srcdir)/prefs.h @@ -506,27 +731,41 @@ 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 +demo-Xm.o: ../config.h +demo-Xm.o: $(UTILS_SRC)/version.h +demo-Xm.o: $(srcdir)/prefs.h +demo-Xm.o: $(UTILS_SRC)/resources.h +demo-Xm.o: $(UTILS_SRC)/visual.h +demo-Xm.o: $(srcdir)/remote.h +demo-Xm.o: $(UTILS_SRC)/usleep.h +demo-Xm.o: XScreenSaver_ad.h +demo-Xm-widgets.o: ../config.h +demo-Gtk.o: ../config.h +demo-Gtk.o: $(UTILS_SRC)/version.h +demo-Gtk.o: $(srcdir)/prefs.h +demo-Gtk.o: $(UTILS_SRC)/resources.h +demo-Gtk.o: $(UTILS_SRC)/visual.h +demo-Gtk.o: $(srcdir)/remote.h +demo-Gtk.o: $(UTILS_SRC)/usleep.h +demo-Gtk.o: $(UTILS_SRC)/logo-50.xpm +demo-Gtk.o: $(UTILS_SRC)/logo-180.xpm +demo-Gtk.o: $(srcdir)/demo-Gtk-widgets.h +demo-Gtk.o: XScreenSaver_ad.h +demo-Gtk-widgets.o: ../config.h +demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-stubs.h +demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.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 +dpms.o: ../config.h +dpms.o: $(srcdir)/xscreensaver.h +dpms.o: $(srcdir)/prefs.h remote.o: ../config.h remote.o: $(srcdir)/remote.h xscreensaver-command.o: ../config.h @@ -542,4 +781,5 @@ test-passwd.o: XScreenSaver_ad.h test-uid.o: ../config.h test-xdpms.o: ../config.h test-grab.o: ../config.h +test-apm.o: ../config.h