X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FMakefile.in;h=e7a07d9c4dea9b00349b071ad7f19508d2f60d69;hp=d10f3d3eb1d9ff48cf3bf980b1be633ddde5f0c0;hb=07faf451b99879183ed7e909e43a0e065be1ee7f;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38 diff --git a/driver/Makefile.in b/driver/Makefile.in index d10f3d3e..e7a07d9c 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -1,4 +1,4 @@ -# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-1999 Jamie Zawinski. +# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-2005 Jamie Zawinski. # the `../configure' script generates `driver/Makefile' from this file. @SET_MAKE@ @@ -14,25 +14,19 @@ install_prefix = prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -#datadir = @datadir@ -datadir = $(GNOME_DATADIR) +datadir = @datadir@ localedir = $(datadir)/locale mandir = @mandir@ +libexecdir = @libexecdir@ mansuffix = 1 manNdir = $(mandir)/man$(mansuffix) INTLTOOL_MERGE = @INTLTOOL_MERGE@ -GNOME_DATADIR = @GNOME_DATADIR@ -GNOME_CCDIR_1 = $(GNOME_DATADIR)/control-center/Desktop -GNOME_CCDIR_2 = $(GNOME_DATADIR)/control-center/capplets -GNOME_CCDIR_3 = $(GNOME_DATADIR)/control-center-2.0/capplets -GNOME_PANELDIR1 = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop -GNOME_PANELDIR2 = $(GNOME_DATADIR)/applications -GNOME_PANELDIR = @GNOME_PANELDIR@ -GLADE_DATADIR = @GLADE_DATADIR@ -GNOME_ICONDIR = $(GNOME_DATADIR)/pixmaps -GNOME_BINDIR = $(bindir) +GTK_DATADIR = @GTK_DATADIR@ +GTK_APPDIR = $(GTK_DATADIR)/applications +GTK_ICONDIR = $(GTK_DATADIR)/pixmaps +GTK_GLADEDIR = $(GTK_DATADIR)/xscreensaver/glade HACK_CONF_DIR = @HACK_CONF_DIR@ CC = @CC@ @@ -42,7 +36,7 @@ LDFLAGS = @LDFLAGS@ DEFS = @DEFS@ INTL_DEFS = -DLOCALEDIR=\"$(localedir)\" SUBP_DEFS = $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"' -GTK_DEFS = $(DEFS) -DDEFAULT_ICONDIR='"$(GLADE_DATADIR)"' +GTK_DEFS = $(DEFS) -DDEFAULT_ICONDIR='"$(GTK_GLADEDIR)"' CONF_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' LIBS = @LIBS@ @@ -119,16 +113,19 @@ 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 test-fade.c test-xinerama.c xdpyinfo.c -TEST_EXES = test-passwd test-uid test-xdpms test-grab \ - test-apm test-fade test-xinerama xdpyinfo +TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c \ + test-apm.c test-fade.c test-xinerama.c test-vp.c \ + test-randr.c xdpyinfo.c +TEST_EXES = test-passwd test-uid test-xdpms test-grab \ + test-apm test-fade test-xinerama test-vp \ + test-randr xdpyinfo MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS) GTK_LIBS = @GTK_LIBS@ $(XMU_LIBS) XML_LIBS = @XML_LIBS@ XDPMS_LIBS = @XDPMS_LIBS@ +XINERAMA_LIBS = @XINERAMA_LIBS@ PASSWD_SRCS = @PASSWD_SRCS@ PASSWD_OBJS = @PASSWD_OBJS@ @@ -155,27 +152,31 @@ DEMO_UTIL_OBJS = $(UTILS_BIN)/resources.o $(UTILS_BIN)/usleep.o \ SAVER_UTIL_SRCS = $(UTILS_SRC)/fade.c $(UTILS_SRC)/overlay.c \ $(UTILS_SRC)/logo.c $(UTILS_SRC)/yarandom.c \ + $(UTILS_SRC)/minixpm.c \ $(DEMO_UTIL_SRCS) SAVER_UTIL_OBJS = $(UTILS_BIN)/fade.o $(UTILS_BIN)/overlay.o \ $(UTILS_BIN)/logo.o $(UTILS_BIN)/yarandom.o \ + $(UTILS_BIN)/minixpm.o \ $(DEMO_UTIL_OBJS) GETIMG_SRCS_1 = xscreensaver-getimage.c GETIMG_OBJS_1 = xscreensaver-getimage.o GETIMG_SRCS = $(GETIMG_SRCS_1) \ - $(UTILS_SRC)/colorbars.o $(UTILS_SRC)/resources.o \ - $(UTILS_SRC)/yarandom.o $(UTILS_SRC)/visual.o \ - $(UTILS_SRC)/usleep.o $(UTILS_SRC)/hsv.o \ - $(UTILS_SRC)/colors.o $(UTILS_SRC)/grabscreen.o \ - $(UTILS_SRC)/logo.o prefs.o $(XMU_SRCS) + $(UTILS_BIN)/colorbars.o $(UTILS_BIN)/resources.o \ + $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/visual.o \ + $(UTILS_BIN)/usleep.o $(UTILS_BIN)/hsv.o \ + $(UTILS_BIN)/colors.o $(UTILS_BIN)/grabscreen.o \ + $(UTILS_BIN)/logo.o $(UTILS_BIN)/minixpm.o prefs.o \ + $(XMU_SRCS) GETIMG_OBJS = $(GETIMG_OBJS_1) \ $(UTILS_BIN)/colorbars.o $(UTILS_BIN)/resources.o \ $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/visual.o \ $(UTILS_BIN)/usleep.o $(UTILS_BIN)/hsv.o \ $(UTILS_BIN)/colors.o $(UTILS_BIN)/grabscreen.o \ - $(UTILS_BIN)/logo.o prefs.o $(XMU_OBJS) + $(UTILS_BIN)/logo.o $(UTILS_BIN)/minixpm.o prefs.o \ + $(XMU_OBJS) SAVER_SRCS_1 = xscreensaver.c windows.c timers.c subprocs.c exec.c \ xset.c splash.c setuid.c stderr.c @@ -201,7 +202,7 @@ PDF2JPEG_OBJS = pdf2jpeg.o PDF2JPEG_LIBS = -framework Cocoa SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \ - $(XDPMS_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \ + $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \ -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ $(PASSWD_LIBS) @@ -216,27 +217,28 @@ EXES = xscreensaver xscreensaver-command xscreensaver-demo \ EXES2 = @ALL_DEMO_PROGRAMS@ EXES_OSX = pdf2jpeg -SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video +SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ + xscreensaver-text SCRIPTS_OSX = xscreensaver-getimage-desktop SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ -HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \ +HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ + xscreensaver.h prefs.h remote.h exec.h \ demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \ demo-Gtk-conf.h MEN_1 = xscreensaver.man xscreensaver-demo.man \ xscreensaver-command.man \ + xscreensaver-text.man \ xscreensaver-getimage.man \ xscreensaver-getimage-file.man \ xscreensaver-getimage-video.man MEN_OSX = xscreensaver-getimage-desktop.man pdf2jpeg.man MEN = $(MEN_1) @MEN_OSX@ -EXTRAS = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \ - xscreensaver-demo.glade xscreensaver-demo.glade2 \ - xscreensaver-demo.glade2p \ +EXTRAS = README Makefile.in \ + XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \ + xscreensaver-demo.glade2 xscreensaver-demo.glade2p \ screensaver-properties.desktop.in \ - screensaver-properties-capplet \ - xscreensaver.kss.in \ .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 \ @@ -255,9 +257,9 @@ all: $(EXES) $(EXES2) tests: $(TEST_EXES) install: install-program install-ad install-scripts \ - install-gnome install-kde install-man @INSTALL_PAM@ + install-gnome install-man install-xml install-pam uninstall: uninstall-program uninstall-ad \ - uninstall-gnome uninstall-kde uninstall-man + uninstall-gnome uninstall-man uninstall-xml install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \ @@ -350,27 +352,47 @@ munge-scripts: $(SCRIPTS) sed "s@^\(#!\)\(/[^ ]*/perl[^ ]*\)\(.*\)\$$@\1$$perl\3@" \ < $(srcdir)/$$program > $$tmp ; \ if cmp -s $(srcdir)/$$program $$tmp ; then \ - echo "$$program unchanged" ; \ true ; \ else \ - echo "$$program: setting interpreter to $$perl" ; \ + echo "$$program: setting interpreter to $$perl" >&2 ; \ cat $$tmp > ./$$program ; \ fi ; \ done ; \ rm -f $$tmp +# When installing man pages, we install "foo.man" as "foo.N" and update +# the .TH line in the installed file with one like +# +# .TH XScreenSaver N "V.VV (DD-MMM-YYYY)" "X Version 11" +# +# where N is the manual section suffix. +# install-man: $(MEN) @men="$(MEN)" ; \ + U=$(UTILS_SRC)/version.h ; \ + V=`sed -n 's/.*xscreensaver \([0-9]\.[^)]*)\).*/\1/p' < $$U` ; \ + T=/tmp/xs$$$$.$(mansuffix) ; \ + TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ + echo "installing man pages: $$TH" ; \ + \ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ + \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ + manbase=`echo $$man | sed 's/\.man$$//'` ; \ + TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ; \ + sed -e "s/^\.TH.*/$$TH/" \ + -e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/' \ + -e 's@(MANSUFFIX)@($(mansuffix))@g' \ + < $(srcdir)/$$man > $$T ; \ echo $(INSTALL_DATA) $(srcdir)/$$man \ $(install_prefix)$(manNdir)/$$instname ; \ - $(INSTALL_DATA) $(srcdir)/$$man \ + $(INSTALL_DATA) $$T \ $(install_prefix)$(manNdir)/$$instname ; \ - done + done ; \ + rm -f $$T uninstall-program: @for program in $(EXES) $(SCRIPTS); do \ @@ -385,8 +407,8 @@ uninstall-man: @men="$(MEN)" ; \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ - echo rm -f $(install_prefix)$(manNdir)/$$instname ; \ - rm -f $(install_prefix)$(manNdir)/$$instname ; \ + echo rm -f $(install_prefix)$(manNdir)/$$instname* ; \ + rm -f $(install_prefix)$(manNdir)/$$instname* ; \ done install-pam: @@ -450,7 +472,9 @@ install-pam: echo rm -f $$src ; \ rm -f $$src ; \ fi ; \ - if ! ( grep $$dest $$conf >/dev/null ); then \ + if ( grep $$dest $$conf >/dev/null ); then \ + echo ; \ + else \ e=echo ; \ $$e "" ;\ $$e " ####################################################################";\ @@ -465,164 +489,74 @@ install-pam: fi ; \ fi +# screensaver-properties.desktop +# into /usr/share/applications/ install-gnome:: screensaver-properties.desktop - @lost="" ;\ - if [ "$(GNOME_DATADIR)" != "" ]; then \ - \ - if [ ! -d "$(install_prefix)$(GNOME_CCDIR_1)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ - fi ;\ - if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ - fi ;\ - if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ - 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) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\ - \ - if $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\ - then true ;\ - else \ - lost="$$lost $(install_prefix)$(GNOME_CCDIR_1)" ;\ - fi ;\ - \ - echo $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\ - \ - if $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\ - then true ;\ - else \ - lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)" ;\ - fi ;\ - \ - echo $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\ - \ - if $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\ - then true ;\ - else \ - lost="$$lost $(install_prefix)$(GNOME_CCDIR_3)" ;\ - fi ;\ - \ - echo $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop;\ - if $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop;\ - then true ;\ - else \ - lost="$$lost $(install_prefix)$(GNOME_PANELDIR)" ;\ - fi ;\ - \ - if [ "$$lost" != "" ]; then \ - e=echo ; \ - $$e "" ;\ - $$e " ####################################################################";\ - $$e " Warning: unable to install screensaver-properties.desktop into:" ;\ - set - $$lost ;\ - for f in $$@ ; do echo " $$f/" ; done ;\ - $$e ' This means the "Screen Saver" section of the Gnome' ;\ - $$e " Control Center (gnomecc) may 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) $(srcdir)/$$program \ - $(install_prefix)$(GNOME_BINDIR)/$$program ;\ - if $(INSTALL_SCRIPT) $(srcdir)/$$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 ; \ + @if [ "$(GTK_DATADIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ + fi ;\ + name2=gnome-screensaver-properties.desktop ;\ + echo $(INSTALL_DATA) screensaver-properties.desktop \ + $(install_prefix)$(GTK_APPDIR)/$$name2 ;\ + $(INSTALL_DATA) screensaver-properties.desktop \ + $(install_prefix)$(GTK_APPDIR)/$$name2 ;\ fi + # xscreensaver.xpm # into /usr/share/pixmaps/ 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)" ;\ + @if [ "$(GTK_DATADIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GTK_ICONDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ fi ;\ target=xscreensaver.xpm ;\ echo $(INSTALL_DATA) $(LOGO) \ - $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ + $(install_prefix)$(GTK_ICONDIR)/$$target ;\ $(INSTALL_DATA) $(LOGO) \ - $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ + $(install_prefix)$(GTK_ICONDIR)/$$target ;\ fi # ../utils/images/screensaver-*.png -# into /usr/share/xscreensaver/ -# -# Should these really go in GLADE_DATADIR (/usr/share/xscreensaver/) -# or should they instead go in GNOME_ICONDIR (/usr/share/pixmaps/)? -# Does it matter? -# +# into /usr/share/xscreensaver/glade/ install-gnome:: - @if [ "$(GLADE_DATADIR)" != "" ]; then \ - if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)" ;\ + @if [ "$(GTK_GLADEDIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ fi ;\ for target in $(GTK_ICONS) ; do \ dest=`echo $$target | sed 's@^.*/@@'` ;\ echo $(INSTALL_DATA) $$target \ - $(install_prefix)$(GLADE_DATADIR)/$$dest ;\ + $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\ $(INSTALL_DATA) $$target \ - $(install_prefix)$(GLADE_DATADIR)/$$dest ;\ + $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\ done ;\ fi # xscreensaver-demo.glade2 -# into /usr/share/xscreensaver/ +# into /usr/share/xscreensaver/glade/ install-gnome:: xscreensaver-demo.glade2 - @if [ "$(GLADE_DATADIR)" != "" ]; then \ - if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)" ;\ + @if [ "$(GTK_GLADEDIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ fi ;\ target=xscreensaver-demo.glade2 ;\ echo $(INSTALL_DATA) $(srcdir)/$$target \ - $(install_prefix)$(GLADE_DATADIR)/$$target ;\ + $(install_prefix)$(GTK_GLADEDIR)/$$target ;\ if $(INSTALL_DATA) $(srcdir)/$$target \ - $(install_prefix)$(GLADE_DATADIR)/$$target ;\ + $(install_prefix)$(GTK_GLADEDIR)/$$target ;\ then true ;\ else \ e=echo ; \ $$e "" ;\ $$e " ####################################################################";\ $$e " Warning: unable to install $$target into" ;\ - $$e " $(install_prefix)$(GLADE_DATADIR)/." ;\ + $$e " $(install_prefix)$(GTK_GLADEDIR)/." ;\ $$e " Without this file, xscreensaver-demo will not" ;\ $$e " be able to run properly." ;\ $$e " ####################################################################";\ @@ -633,93 +567,68 @@ install-gnome:: xscreensaver-demo.glade2 # screensaver-properties.desktop -# into /usr/share/gnome/apps/Settings/Desktop/ +# into /usr/share/applications/ uninstall-gnome:: - @if [ "$(GNOME_DATADIR)" != "" ]; then \ - f=screensaver-properties.desktop ;\ - echo rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ - rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ - echo rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f ;\ - rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f ;\ - echo rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f ;\ - rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f ;\ - echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f ;\ - rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f ;\ + @if [ "$(GTK_DATADIR)" != "" ]; then \ + f=gnome-screensaver-properties.desktop ;\ + echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ + rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ fi -# screensaver-properties-capplet -# into /usr/X11R6/bin/ -uninstall-gnome:: - @if [ "$(GNOME_DATADIR)" != "" ]; then \ - program=screensaver-properties-capplet ;\ - echo rm -f $(install_prefix)$(bindir)/$$program ;\ - rm -f $(install_prefix)$(bindir)/$$program ;\ - fi - # xscreensaver.xpm # into /usr/share/pixmaps/ uninstall-gnome:: - @if [ "$(GNOME_ICONDIR)" != "" ]; then \ + @if [ "$(GTK_ICONDIR)" != "" ]; then \ target=xscreensaver.xpm ;\ - echo rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ - rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ + echo rm -f $(install_prefix)$(GTK_ICONDIR)/$$target ;\ + rm -f $(install_prefix)$(GTK_ICONDIR)/$$target ;\ fi # ../utils/images/screensaver-*.png -# into /usr/share/xscreensaver/ +# into /usr/share/xscreensaver/glade/ uninstall-gnome:: - @if [ "$(GLADE_DATADIR)" != "" ]; then \ + @if [ "$(GTK_GLADEDIR)" != "" ]; then \ for target in $(GTK_ICONS) ; do \ dest=`echo $$target | sed 's@^.*/@@'` ;\ - echo rm -f $(install_prefix)$(GLADE_DATADIR)/$$dest ;\ - rm -f $(install_prefix)$(GLADE_DATADIR)/$$dest ;\ + echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\ + rm -f $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\ done ;\ fi -# xscreensaver.kss -install-kde: - @src="xscreensaver.kss" ; \ - if [ "$$KDEDIR" != "" ]; then \ - dir="$(install_prefix)$$KDEDIR/bin" ; \ - dest="$$dir/$$src" ; \ - 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 +# xscreensaver-demo.glade2 +# into /usr/share/xscreensaver/glade/ +uninstall-gnome:: xscreensaver-demo.glade2 + @if [ "$(GTK_GLADEDIR)" != "" ]; then \ + target=xscreensaver-demo.glade2 ;\ + echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target ;\ + rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target ;\ + fi + +# /usr/share/xscreensaver/config/README +install-xml: + @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + if [ ! -d $$dest ]; then \ + $(INSTALL_DIRS) $$dest ; \ + fi ; \ + src=$(srcdir)/../hacks/config ; \ + echo $(INSTALL_DATA) $$src/README $$dest/README ; \ + $(INSTALL_DATA) $$src/README $$dest/README -uninstall-kde: - @if [ "$$KDEDIR" != "" ]; then \ - dest="$(install_prefix)$$KDEDIR/bin/xscreensaver.kss" ; \ - echo rm -f $$dest ; \ - rm -f $$dest ; \ - fi + +# /usr/share/xscreensaver/config/README +uninstall-xml: + rm -f $(install_prefix)$(HACK_CONF_DIR)/README clean: - -rm -f *.o a.out core $(EXES) $(EXES2) $(TEST_EXES) XScreenSaver_ad.h + -rm -f *.o a.out core $(EXES) $(EXES2) $(TEST_EXES) \ + XScreenSaver_ad.h XScreenSaver_Xm_ad.h distclean: clean - -rm -f Makefile XScreenSaver.ad TAGS *~ "#"* screensaver-properties.desktop + -rm -f Makefile XScreenSaver.ad \ + TAGS *~ "#"* screensaver-properties.desktop # Adds all current dependencies to Makefile -depend: XScreenSaver_ad.h +depend: XScreenSaver_ad.h XScreenSaver_Xm_ad.h $(DEPEND) -s '# DO NOT DELETE: updated by make depend' \ $(DEPEND_FLAGS) -- \ $(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) -- \ @@ -729,7 +638,7 @@ depend: XScreenSaver_ad.h # close. This excludes dependencies on files in /usr/include, etc. It tries # to include only dependencies on files which are themselves a part of this # package. -distdepend: check_men update_ad_version update_man_version XScreenSaver_ad.h +distdepend: check_men update_ad_version XScreenSaver_ad.h XScreenSaver_Xm_ad.h @echo updating dependencies in `pwd`/Makefile.in... ; \ $(DEPEND) -w 0 -f - \ -s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \ @@ -746,6 +655,7 @@ distdepend: check_men update_ad_version update_man_version XScreenSaver_ad.h -e 's@\.\./utils@$$(UTILS_SRC)@g' \ -e 's@ \([^$$]\)@ $$(srcdir)/\1@g' \ -e 's@$$.*\(XScreenSaver_ad\)@\1@g' \ + -e 's@$$.*\(XScreenSaver_Xm_ad\)@\1@g' \ -e 's@ $$(srcdir)/\(.*config\.h\)@ \1@g' ; \ echo '' \ ) > /tmp/distdepend.$$$$ && \ @@ -757,49 +667,31 @@ distdepend: check_men update_ad_version update_man_version XScreenSaver_ad.h # have a version skew between the app-defaults file and the executable. # Also update hacks/config/README in the same way. update_ad_version:: - @files="XScreenSaver.ad.in ../hacks/config/README" ; \ - U=$(UTILS_SRC)/version.h ; \ - V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ; \ - D=`date '+%d-%b-%Y'` ; \ - for S in $$files ; do \ - echo -n "Updating $$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][0-9]*\)/$$D/" \ - < $$S > $$T ; \ - if cmp -s $$S $$T ; then \ - echo "unchanged." ; \ - else \ - cat $$T > $$S ; \ - echo "done." ; \ - fi ; \ - done ; \ - rm $$T - -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)" ; \ - echo -n "Updating $$S to \"$$V\"... " ; \ - T=/tmp/xs.$$$$ ; \ - sed "s/^\(\.TH[^\"]*\)\"[^\"]*\"\(.*\)/\1\"$$V\"\2/" \ - < $$S > $$T ; \ - if cmp -s $$S $$T ; then \ - echo "unchanged." ; \ - else \ - cat $$T > $$S ; \ - echo "done." ; \ - fi ; \ - rm $$T ; \ - done + @ \ + files="XScreenSaver.ad.in ../hacks/config/README ../OSX/bindist.rtf" ; \ + U=$(UTILS_SRC)/version.h ; \ + V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ; \ + D=`date '+%d-%b-%Y'` ; \ + for S in $$files ; do \ + T=/tmp/xs.$$$$ ; \ + sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*[ab]*[0-9]*\(.*\)/\1$$V\2/" \ + -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 \ + true ; \ + else \ + cat $$T > $$S ; \ + echo "updated $$S to $$V $$D" ; \ + fi ; \ + done ; \ + rm $$T TAGS: tags tags: find $(srcdir) -name '*.[chly]' -print | xargs etags -a echo_tarfiles: - @$(MAKE) XScreenSaver_ad.h 2>&1 >&- /dev/null + @$(MAKE) XScreenSaver_ad.h XScreenSaver_Xm_ad.h 2>&1 >&- /dev/null @echo $(TARFILES) check_men: @@ -831,6 +723,7 @@ $(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)/logo.o: $(UTILS_SRC)/logo.c +$(UTILS_BIN)/minixpm.o: $(UTILS_SRC)/minixpm.c $(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c $(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c @@ -867,6 +760,9 @@ demo-Gtk-conf.o: demo-Gtk-conf.c XScreenSaver_ad.h: XScreenSaver.ad $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver.ad > XScreenSaver_ad.h +XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad + $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h + @INTLTOOL_DESKTOP_RULE@ # The executables linked in this directory. @@ -891,12 +787,15 @@ xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@ xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \ $(MOTIF_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \ - $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS) + $(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS) xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS) $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \ - $(GTK_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \ - $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS) + $(GTK_LIBS) $(XPM_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) \ + -lXt -lX11 $(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS) + +demo-Gtk.o: XScreenSaver_ad.h +demo-Xm.o: XScreenSaver_ad_Xm.h xscreensaver-getimage: $(GETIMG_OBJS) $(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm @@ -922,6 +821,14 @@ test-xdpms: test-xdpms.o test-xinerama: test-xinerama.o $(CC) $(LDFLAGS) -o $@ test-xinerama.o $(LIBS) $(X_LIBS) $(SAVER_LIBS)\ + $(X_PRE_LIBS) $(XINERAMA_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) + +test-vp: test-vp.o + $(CC) $(LDFLAGS) -o $@ test-vp.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \ + $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) + +test-randr: test-randr.o + $(CC) $(LDFLAGS) -o $@ test-randr.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \ $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) test-grab: test-grab.o @@ -951,13 +858,13 @@ xdpyinfo: xdpyinfo.o demo-Gtk-conf.o: ../config.h demo-Gtk-conf.o: $(srcdir)/demo-Gtk-conf.h +demo-Gtk.o: XScreenSaver_ad.h demo-Gtk.o: ../config.h demo-Gtk.o: $(srcdir)/demo-Gtk-conf.h demo-Gtk.o: $(srcdir)/demo-Gtk-support.h demo-Gtk.o: $(srcdir)/demo-Gtk-widgets.h demo-Gtk.o: $(srcdir)/prefs.h demo-Gtk.o: $(srcdir)/remote.h -demo-Gtk.o: XScreenSaver_ad.h demo-Gtk-support.o: ../config.h demo-Gtk-support.o: $(srcdir)/demo-Gtk-support.h demo-Gtk-widgets.o: ../config.h @@ -970,6 +877,7 @@ dpms.o: ../config.h dpms.o: $(srcdir)/prefs.h dpms.o: $(srcdir)/xscreensaver.h exec.o: ../config.h +exec.o: $(srcdir)/exec.h lock.o: ../config.h lock.o: $(srcdir)/prefs.h lock.o: $(srcdir)/xscreensaver.h @@ -989,6 +897,7 @@ stderr.o: ../config.h stderr.o: $(srcdir)/prefs.h stderr.o: $(srcdir)/xscreensaver.h subprocs.o: ../config.h +subprocs.o: $(srcdir)/exec.h subprocs.o: $(srcdir)/prefs.h subprocs.o: $(srcdir)/xscreensaver.h test-apm.o: ../config.h @@ -996,11 +905,13 @@ test-fade.o: ../config.h test-fade.o: $(srcdir)/prefs.h test-fade.o: $(srcdir)/xscreensaver.h test-grab.o: ../config.h +test-passwd.o: XScreenSaver_ad.h test-passwd.o: ../config.h test-passwd.o: $(srcdir)/prefs.h -test-passwd.o: XScreenSaver_ad.h test-passwd.o: $(srcdir)/xscreensaver.h +test-randr.o: ../config.h test-uid.o: ../config.h +test-vp.o: ../config.h test-xdpms.o: ../config.h test-xinerama.o: ../config.h timers.o: ../config.h @@ -1014,9 +925,9 @@ xscreensaver-command.o: $(srcdir)/remote.h xscreensaver-getimage.o: ../config.h xscreensaver-getimage.o: XScreenSaver_ad.h xscreensaver-getimage.o: $(srcdir)/prefs.h +xscreensaver.o: XScreenSaver_ad.h xscreensaver.o: ../config.h xscreensaver.o: $(srcdir)/prefs.h -xscreensaver.o: XScreenSaver_ad.h xscreensaver.o: $(srcdir)/xscreensaver.h xset.o: ../config.h xset.o: $(srcdir)/prefs.h