X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=b56e7c658c012ad10bbd54df6efdad78c89ade7b;hb=de041722414a2e31c1c04caa10aaec9d6952e9b4;hp=36a50c02bd77d24abe883b41c34e4b391eaea233;hpb=0ed85ca0e4b0eae40a4f50a51d63f2f41e45373a;p=xscreensaver diff --git a/driver/Makefile.in b/driver/Makefile.in index 36a50c02..b56e7c65 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -16,6 +16,10 @@ 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 + CC = @CC@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ @@ -31,6 +35,7 @@ SHELL = /bin/sh INSTALL = @INSTALL@ SUID_FLAGS = -o root -m 4755 INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_PROGRAM@ INSTALL_SETUID = @INSTALL_SETUID@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIRS = @INSTALL_DIRS@ @@ -63,15 +68,12 @@ 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 GTK_SRCS = demo-Gtk.c demo-Gtk-widgets.c GTK_OBJS = demo-Gtk.o demo-Gtk-widgets.o -ATHENA_SRCS = dialogs-Xaw.c -ATHENA_OBJS = dialogs-Xaw.o - PWENT_SRCS = passwd-pwent.c PWENT_OBJS = passwd-pwent.o @@ -89,10 +91,8 @@ NOLOCK_OBJS_1 = lock.o TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c \ test-apm.c xdpyinfo.c -MOTIF_LIBS = @MOTIF_LIBS@ +MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@ GTK_LIBS = @GTK_LIBS@ -ATHENA_LIBS = @ATHENA_LIBS@ -ATHENA3D_LIBS = @ATHENA3D_LIBS@ PASSWD_SRCS = @PASSWD_SRCS@ PASSWD_OBJS = @PASSWD_OBJS@ @@ -135,10 +135,10 @@ SAVER_OBJS = $(SAVER_OBJS_1) prefs.o $(LOCK_OBJS) \ CMD_SRCS = remote.c xscreensaver-command.c CMD_OBJS = remote.o xscreensaver-command.o -DEMO_SRCS_1 = prefs.c demo.c $(XMU_SRCS) -DEMO_OBJS_1 = prefs.o demo-Xm.o demo-Xaw.o $(XMU_OBJS) +DEMO_SRCS_1 = prefs.c $(XMU_SRCS) +DEMO_OBJS_1 = prefs.o $(XMU_OBJS) -DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS) demo.c +DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS) DEMO_OBJS = prefs.o remote.o $(DEMO_UTIL_OBJS) SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) \ @@ -148,24 +148,27 @@ SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) \ CMD_LIBS = $(LIBS) $(X_LIBS) \ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -EXES = xscreensaver xscreensaver-command xscreensaver-demo +EXES = xscreensaver xscreensaver-command xscreensaver-demo \ + screensaver-properties-capplet EXES2 = @ALL_DEMO_PROGRAMS@ HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \ demo-Gtk-widgets.h demo-Gtk-stubs.h -MEN = xscreensaver.man @DEMO_MAN@ \ +MEN = xscreensaver.man xscreensaver-demo.man \ xscreensaver-command.man ALL_MEN = xscreensaver.man \ - xscreensaver-demo.man xscreensaver-demo-old.man \ - xscreensaver-command.man + xscreensaver-demo.man xscreensaver-command.man EXTRAS = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \ - xscreensaver.kss xscreensaver-demo.glade .gdbinit + 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) $(GTK_SRCS) $(ATHENA_SRCS) $(PWENT_SRCS) \ + $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) \ $(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \ $(CMD_SRCS) $(HDRS) $(TEST_SRCS) $(ALL_MEN) @@ -173,8 +176,10 @@ TARFILES = $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) \ default: $(EXES) all: $(EXES) $(EXES2) -install: install-program install-ad install-kde install-man @INSTALL_PAM@ -uninstall: uninstall-program uninstall-ad uninstall-kde 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' \ @@ -208,8 +213,12 @@ install-program: $(EXES) 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 @@ -253,7 +262,6 @@ install-man: $(MEN) fi ; \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ - instname=`echo $$instname | sed 's/-old//'` ; \ echo $(INSTALL_DATA) $(srcdir)/$$man \ $(install_prefix)$(man1dir)/$$instname ; \ $(INSTALL_DATA) $(srcdir)/$$man \ @@ -285,8 +293,26 @@ install-pam: 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 "" ;\ @@ -322,13 +348,79 @@ install-pam: 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 + +uninstall-gnome: + @if [ "$(install_prefix)$(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 + install-kde: @src="$(srcdir)/xscreensaver.kss" ; \ if [ "$$KDEDIR" != "" ]; then \ dir="$(install_prefix)$$KDEDIR/bin" ; \ dest="$$dir/xscreensaver.kss" ; \ - echo $(INSTALL_PROGRAM) $$src $$dest ; \ - if $(INSTALL_PROGRAM) $$src $$dest ; then \ + echo $(INSTALL_SCRIPT) $$src $$dest ; \ + if $(INSTALL_SCRIPT) $$src $$dest ; then \ true ; \ else \ e=echo ; \ @@ -379,7 +471,7 @@ 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) $(GTK_SRCS) $(ATHENA_SRCS) \ + $(SAVER_SRCS_1) $(MOTIF_SRCS) $(GTK_SRCS) \ $(PWENT_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) \ $(TEST_SRCS) | \ ( \ @@ -401,11 +493,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." ; \ @@ -419,7 +511,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/" \ @@ -475,6 +567,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) @@ -487,33 +585,14 @@ xscreensaver-command: $(CMD_OBJS) xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@ cp -p @PREFERRED_DEMO_PROGRAM@ $@ -xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) demo-Xm.o - $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) demo-Xm.o \ - $(LIBS) $(X_LIBS) \ +xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) + $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \ $(MOTIF_LIBS) $(X_PRE_LIBS) -lXt -lX11 -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 -lXext $(X_EXTRA_LIBS) -xscreensaver-demo-Xaw: $(DEMO_OBJS) $(ATHENA_OBJS) demo-Xaw.o - $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(ATHENA_OBJS) demo-Xaw.o \ - $(LIBS) $(X_LIBS) \ - $(ATHENA_LIBS) $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) - -xscreensaver-demo-Xaw3d: $(DEMO_OBJS) $(ATHENA_OBJS) demo-Xaw.o - $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(ATHENA_OBJS) demo-Xaw.o \ - $(LIBS) $(X_LIBS) \ - $(ATHENA3D_LIBS) $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) - -demo-Xm.o: demo.c XScreenSaver_ad.h - $(CC) -o $@ -c -DFORCE_MOTIF \ - $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $(srcdir)/demo.c -demo-Xaw.o: demo.c XScreenSaver_ad.h - $(CC) -o $@ -c -DFORCE_ATHENA \ - $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $(srcdir)/demo.c - - TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \ @@ -578,6 +657,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 @@ -593,8 +673,15 @@ 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 +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 @@ -607,8 +694,6 @@ 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 -dialogs-Xaw.o: ../config.h -dialogs-Xaw.o: $(UTILS_SRC)/visual.h passwd-pwent.o: ../config.h lock.o: ../config.h lock.o: $(srcdir)/xscreensaver.h @@ -618,14 +703,6 @@ passwd.o: ../config.h prefs.o: ../config.h prefs.o: $(srcdir)/prefs.h prefs.o: $(UTILS_SRC)/resources.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 remote.o: ../config.h remote.o: $(srcdir)/remote.h xscreensaver-command.o: ../config.h