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@
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@
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 \
ALL_MEN = xscreensaver.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
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' \
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
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 "" ;\
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 ; \
@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." ; \
@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/" \
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)
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
projects / xscreensaver / blobdiff