X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FMakefile.in;h=2830471053e7c9ffa7692d9def6bf4c68f6bbc3e;hp=4e0977c602622a7d8f9aeb822cd5a3f9b2fb9903;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=40eacb5812ef7c0e3374fb139afbb4f5bc8bbfb5 diff --git a/driver/Makefile.in b/driver/Makefile.in index 4e0977c6..28304710 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -1,9 +1,9 @@ -# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-1999 Jamie Zawinski. +# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-2004 Jamie Zawinski. # the `../configure' script generates `driver/Makefile' from this file. @SET_MAKE@ .SUFFIXES: -.SUFFIXES: .c .o +.SUFFIXES: .c .m .o srcdir = @srcdir@ VPATH = @srcdir@ @@ -31,10 +31,12 @@ 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) HACK_CONF_DIR = @HACK_CONF_DIR@ CC = @CC@ +OBJCC = @OBJCC@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ DEFS = @DEFS@ @@ -109,15 +111,20 @@ KERBEROS_OBJS = passwd-kerberos.o PAM_SRCS = passwd-pam.c PAM_OBJS = passwd-pam.o +PWHELPER_SRCS = passwd-helper.c +PWHELPER_OBJS = passwd-helper.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 test-fade.c xdpyinfo.c -TEST_EXES = test-passwd test-uid test-xdpms test-grab \ - test-apm test-fade 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) @@ -141,7 +148,7 @@ GL_LIBS = @SAVER_GL_LIBS@ ICON_SRC = $(UTILS_SRC)/images LOGO = $(ICON_SRC)/logo-50.xpm -GTK_ICONS = $(ICON_SRC)/screensaver-*.xpm +GTK_ICONS = $(ICON_SRC)/screensaver-*.png DEMO_UTIL_SRCS = $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \ $(UTILS_SRC)/visual.c @@ -191,6 +198,10 @@ DEMO_OBJS_1 = prefs.o dpms.o $(XMU_OBJS) DEMO_SRCS = prefs.c dpms.c remote.c exec.c $(DEMO_UTIL_SRCS) DEMO_OBJS = prefs.o dpms.o remote.o exec.o $(DEMO_UTIL_OBJS) +PDF2JPEG_SRCS = pdf2jpeg.m +PDF2JPEG_OBJS = pdf2jpeg.o +PDF2JPEG_LIBS = -framework Cocoa + SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \ $(XDPMS_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \ -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ @@ -203,18 +214,25 @@ GETIMG_LIBS = $(LIBS) $(X_LIBS) $(XPM_LIBS) $(JPEG_LIBS) \ $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) EXES = xscreensaver xscreensaver-command xscreensaver-demo \ - xscreensaver-getimage + xscreensaver-getimage @EXES_OSX@ EXES2 = @ALL_DEMO_PROGRAMS@ -SCRIPTS = xscreensaver-getimage-file xscreensaver-getimage-video +EXES_OSX = pdf2jpeg + +SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video +SCRIPTS_OSX = xscreensaver-getimage-desktop +SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \ demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \ demo-Gtk-conf.h -MEN = xscreensaver.man xscreensaver-demo.man \ +MEN_1 = xscreensaver.man xscreensaver-demo.man \ xscreensaver-command.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 \ @@ -227,10 +245,11 @@ VMSFILES = compile_axp.com compile_decc.com link_axp.com link_decc.com \ vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt TARFILES = $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) \ - $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) \ + $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) $(PWHELPER_SRCS) \ $(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \ - $(CMD_SRCS) $(GETIMG_SRCS_1) $(HDRS) $(SCRIPTS) \ - $(TEST_SRCS) $(MEN) + $(CMD_SRCS) $(GETIMG_SRCS_1) $(PDF2JPEG_SRCS) $(HDRS) \ + $(SCRIPTS_1) $(SCRIPTS_OSX) $(MEN_1) $(MEN_OSX) \ + $(TEST_SRCS) default: $(EXES) @@ -273,18 +292,11 @@ 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 - @echo $(INSTALL_PROGRAM) xscreensaver-getimage \ - $(install_prefix)$(bindir)/xscreensaver-getimage ; \ - $(INSTALL_PROGRAM) xscreensaver-getimage \ - $(install_prefix)$(bindir)/xscreensaver-getimage + @for exe in xscreensaver-command xscreensaver-demo \ + xscreensaver-getimage @EXES_OSX@ ; do \ + echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ + $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ + done install-ad: XScreenSaver.ad @if [ ! -d $(install_prefix)$(AD_DIR) ]; then \ @@ -337,12 +349,13 @@ munge-scripts: $(SCRIPTS) perl="${PERL}" ; \ rm -f $$tmp ; \ for program in $(SCRIPTS); do \ - echo "adjusting location of perl in $$program..." ; \ 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" ; \ cat $$tmp > ./$$program ; \ fi ; \ done ; \ @@ -556,20 +569,27 @@ install-gnome:: screensaver-properties-capplet fi # xscreensaver.xpm +# into /usr/share/pixmaps/ install-gnome:: $(LOGO) - @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 [ "$(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)$(GLADE_DATADIR)/$$target ;\ + $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ $(INSTALL_DATA) $(LOGO) \ - $(install_prefix)$(GLADE_DATADIR)/$$target ;\ + $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ fi -# ../utils/images/screensaver-*.xpm +# ../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? +# install-gnome:: @if [ "$(GLADE_DATADIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then \ @@ -586,6 +606,7 @@ install-gnome:: fi # xscreensaver-demo.glade2 +# into /usr/share/xscreensaver/ install-gnome:: xscreensaver-demo.glade2 @if [ "$(GLADE_DATADIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then \ @@ -614,6 +635,7 @@ install-gnome:: xscreensaver-demo.glade2 # screensaver-properties.desktop +# into /usr/share/gnome/apps/Settings/Desktop/ uninstall-gnome:: @if [ "$(GNOME_DATADIR)" != "" ]; then \ f=screensaver-properties.desktop ;\ @@ -628,6 +650,7 @@ uninstall-gnome:: fi # screensaver-properties-capplet +# into /usr/X11R6/bin/ uninstall-gnome:: @if [ "$(GNOME_DATADIR)" != "" ]; then \ program=screensaver-properties-capplet ;\ @@ -636,14 +659,16 @@ uninstall-gnome:: fi # xscreensaver.xpm +# into /usr/share/pixmaps/ uninstall-gnome:: - @if [ "$(GLADE_DATADIR)" != "" ]; then \ + @if [ "$(GNOME_ICONDIR)" != "" ]; then \ target=xscreensaver.xpm ;\ - echo rm -f $(install_prefix)$(GLADE_DATADIR)/$$target ;\ - rm -f $(install_prefix)$(GLADE_DATADIR)/$$target ;\ + echo rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ + rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target ;\ fi -# xscreensaver.xpm +# ../utils/images/screensaver-*.png +# into /usr/share/xscreensaver/ uninstall-gnome:: @if [ "$(GLADE_DATADIR)" != "" ]; then \ for target in $(GTK_ICONS) ; do \ @@ -653,6 +678,7 @@ uninstall-gnome:: done ;\ fi +# xscreensaver.kss install-kde: @src="xscreensaver.kss" ; \ if [ "$$KDEDIR" != "" ]; then \ @@ -816,7 +842,10 @@ $(SAVER_UTIL_OBJS): # How we build object files in this directory. .c.o: - $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< + $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< + +.m.o: + $(OBJCC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< # subprocs takes an extra -D option. subprocs.o: subprocs.c @@ -852,8 +881,14 @@ xscreensaver-command: $(CMD_OBJS) xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@ - cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@ -# $(INSTALL_PROGRAM) @PREFERRED_DEMO_PROGRAM@ $@ + @if [ "@PREFERRED_DEMO_PROGRAM@" = "" ]; then \ + echo "WARNING: neither GTK nor Motif are available," \ + "therefore no xscreensaver-demo!" ; \ + rm -f $@@EXEEXT@ ; \ + else \ + echo cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@ ; \ + cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@ ; \ + fi xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \ @@ -862,12 +897,15 @@ xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) 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) -lXext $(X_EXTRA_LIBS) xscreensaver-getimage: $(GETIMG_OBJS) $(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm +pdf2jpeg: $(PDF2JPEG_OBJS) + $(OBJCC) $(LDFLAGS) -o $@ $(PDF2JPEG_OBJS) $(PDF2JPEG_LIBS) -lm + TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \ subprocs.o setuid.o splash.o prefs.o \ @@ -884,6 +922,18 @@ test-xdpms: test-xdpms.o $(CC) $(LDFLAGS) -o $@ test-xdpms.o $(LIBS) $(X_LIBS) $(XDPMS_LIBS) \ $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) +test-xinerama: test-xinerama.o + $(CC) $(LDFLAGS) -o $@ test-xinerama.o $(LIBS) $(X_LIBS) $(SAVER_LIBS)\ + $(X_PRE_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 $(CC) $(LDFLAGS) -o $@ test-grab.o $(SAVER_LIBS) @@ -911,23 +961,20 @@ 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 demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-stubs.h demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-support.h demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.h -demo-Xm.o: XScreenSaver_ad.h demo-Xm.o: ../config.h -demo-Xm.o: $(srcdir)/prefs.h -demo-Xm.o: $(srcdir)/remote.h demo-Xm-widgets.o: ../config.h dpms.o: ../config.h dpms.o: $(srcdir)/prefs.h @@ -959,12 +1006,15 @@ 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 timers.o: $(srcdir)/prefs.h timers.o: $(srcdir)/xscreensaver.h @@ -976,9 +1026,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