X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=060966aa2ab7ade0136c85df179ea60d1c01b97f;hb=3c58fb6311db49c46f1670922933b27c6ea0c065;hp=dee86900b69456efad9b80ba9264ec93f05844b7;hpb=ebc241816cc8e3eec7270a594bb1a607df32bcd6;p=xscreensaver

diff --git a/driver/Makefile.in b/driver/Makefile.in
index dee86900..060966aa 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -28,6 +28,7 @@ LDFLAGS		= @LDFLAGS@
 DEFS		= @DEFS@
 DEFS2		= $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"'
 LIBS		= @LIBS@
+PERL		= @PERL@
 
 DEPEND		= @DEPEND@
 DEPEND_FLAGS	= @DEPEND_FLAGS@
@@ -37,7 +38,7 @@ SHELL		= /bin/sh
 INSTALL		= @INSTALL@
 SUID_FLAGS      = -o root -m 4755
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT  = @INSTALL_PROGRAM@
+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_SETUID  = @INSTALL_SETUID@
 INSTALL_DATA	= @INSTALL_DATA@
 INSTALL_DIRS	= @INSTALL_DIRS@
@@ -46,6 +47,7 @@ X_CFLAGS	= @X_CFLAGS@
 X_LIBS		= @X_LIBS@
 X_PRE_LIBS	= @X_PRE_LIBS@
 X_EXTRA_LIBS	= @X_EXTRA_LIBS@
+XMU_LIBS	= @XMU_LIBS@
 
 # Note:
 #
@@ -59,6 +61,7 @@ X_EXTRA_LIBS	= @X_EXTRA_LIBS@
 #
 # SAVER_LIBS is the link line for "xscreensaver", and
 # CMD_LIBS is the link line for "xscreensaver-command".
+# GETIMG_LIBS is the link line for "xscreensaver-getimage".
 
 
 AD_DIR		= @APPDEFAULTS@
@@ -91,12 +94,12 @@ 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-apm.c test-fade.c xdpyinfo.c
 TEST_EXES	= test-passwd   test-uid   test-xdpms   test-grab \
-		  test-apm   xdpyinfo
+		  test-apm   test-fade   xdpyinfo
 
-MOTIF_LIBS	= @MOTIF_LIBS@ @XPM_LIBS@
-GTK_LIBS	= @GTK_LIBS@
+MOTIF_LIBS	= @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
+GTK_LIBS	= @GTK_LIBS@ $(XMU_LIBS)
 
 XDPMS_LIBS	= @XDPMS_LIBS@
 
@@ -114,21 +117,36 @@ GL_SRCS		= @SAVER_GL_SRCS@
 GL_OBJS		= @SAVER_GL_OBJS@
 GL_LIBS		= @SAVER_GL_LIBS@
 
-LOGO		= $(UTILS_SRC)/logo.xpm
+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)/logo.c $(UTILS_SRC)/spline.c \
-		  $(UTILS_SRC)/yarandom.c \
+		  $(UTILS_SRC)/logo.c $(UTILS_SRC)/yarandom.c \
 		  $(DEMO_UTIL_SRCS)
 SAVER_UTIL_OBJS	= $(UTILS_BIN)/fade.o $(UTILS_BIN)/overlay.o \
-		  $(UTILS_BIN)/logo.o $(UTILS_BIN)/spline.o \
-		  $(UTILS_BIN)/yarandom.o \
+		  $(UTILS_BIN)/logo.o $(UTILS_BIN)/yarandom.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)
+
+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)
+
 SAVER_SRCS_1	= xscreensaver.c windows.c timers.c subprocs.c \
 		  xset.c splash.c setuid.c stderr.c
 SAVER_OBJS_1	= xscreensaver.o windows.o timers.o subprocs.o \
@@ -148,22 +166,29 @@ DEMO_OBJS_1	= prefs.o dpms.o $(XMU_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@ $(XDPMS_LIBS) $(GL_LIBS) \
-		  $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
+SAVER_LIBS	= $(LIBS) $(X_LIBS) $(XMU_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)
 
-EXES		= xscreensaver xscreensaver-command xscreensaver-demo
+GETIMG_LIBS	= $(LIBS) $(X_LIBS) \
+		  $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS)
+
+EXES		= xscreensaver xscreensaver-command xscreensaver-demo \
+		  xscreensaver-getimage
 EXES2		= @ALL_DEMO_PROGRAMS@
+SCRIPTS		= xscreensaver-getimage-file xscreensaver-getimage-video
 
 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
+		  xscreensaver-command.man \
+		  xscreensaver-getimage.man \
+		  xscreensaver-getimage-file.man \
+		  xscreensaver-getimage-video.man
 EXTRAS		= README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
 		  xscreensaver.kss xscreensaver-demo.glade \
 		  screensaver-properties.desktop.in \
@@ -176,21 +201,21 @@ VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
 TARFILES	= $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) \
 		  $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) \
 		  $(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \
-		  $(CMD_SRCS) $(HDRS) $(TEST_SRCS) $(ALL_MEN)
+		  $(CMD_SRCS) $(GETIMG_SRCS_1) $(HDRS) $(SCRIPTS) \
+		  $(TEST_SRCS) $(MEN)
 
 
 default: $(EXES)
 all: $(EXES) $(EXES2)
 tests: $(TEST_EXES)
 
-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:   install-program   install-ad    install-scripts \
+	   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' \
-		INSTALL_SETUID='$(INSTALL_SETUID) -s' \
 		install
 
 install-program: $(EXES)
@@ -228,6 +253,10 @@ install-program: $(EXES)
 	  $(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
 
 install-ad: XScreenSaver.ad
 	@if [ ! -d $(install_prefix)$(AD_DIR) ]; then			      \
@@ -262,6 +291,33 @@ install-ad: XScreenSaver.ad
 	  fi								      \
 	fi
 
+install-scripts: $(SCRIPTS) munge-scripts
+	@for program in $(SCRIPTS); do					\
+	  if [ -r $$program ] ; then					\
+	    p=$$program ;						\
+	  else								\
+	    p=$(srcdir)/$$program ;					\
+	  fi ;								\
+	  echo $(INSTALL_SCRIPT) $$p					\
+	    $(install_prefix)$(bindir)/$$program ;			\
+	  $(INSTALL_SCRIPT) $$p						\
+	    $(install_prefix)$(bindir)/$$program ;			\
+	done
+
+munge-scripts: $(SCRIPTS)
+	@tmp=/tmp/mf.$$$$ ;						\
+	perl="${PERL}" ;						\
+	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			\
+	    true ;							\
+	  else								\
+	    cat $$tmp > ./$$program ;					\
+	  fi ;								\
+	done
+
 install-man: $(MEN)
 	@men="$(MEN)" ;							\
 	if [ ! -d $(install_prefix)$(man1dir) ]; then			\
@@ -276,7 +332,7 @@ install-man: $(MEN)
 	done
 
 uninstall-program:
-	@for program in $(EXES); do					\
+	@for program in $(EXES) $(SCRIPTS); do				\
 	  echo rm -f $(install_prefix)$(bindir)/$$program ;		\
 	  rm -f $(install_prefix)$(bindir)/$$program ;			\
 	done
@@ -520,7 +576,7 @@ depend: XScreenSaver_ad.h
 	$(DEPEND) -s '# DO NOT DELETE: updated by make depend'		    \
 	$(DEPEND_FLAGS) --						    \
 	$(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --	    \
-	$(SAVER_SRCS) $(CMD_SRCS)
+	$(SAVER_SRCS) $(CMD_SRCS) $(GETIMG_SRCS_1)
 
 # Adds some dependencies to Makefile.in -- not totally accurate, but pretty
 # close.  This excludes dependencies on files in /usr/include, etc.  It tries
@@ -531,7 +587,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)			    \
+	$(SAVER_SRCS_1) $(MOTIF_SRCS) $(GTK_SRCS) $(GETIMG_SRCS_1)	    \
 	$(PWENT_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS)		    \
 	$(TEST_SRCS) |							    \
 	(								    \
@@ -605,8 +661,8 @@ $(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)/spline.o:		$(UTILS_SRC)/spline.c
 $(UTILS_BIN)/yarandom.o:	$(UTILS_SRC)/yarandom.c
+$(UTILS_BIN)/colorbars.o:	$(UTILS_SRC)/colorbars.c
 
 $(SAVER_UTIL_OBJS):
 	cd $(UTILS_BIN) ; \
@@ -655,6 +711,8 @@ xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
 	$(GTK_LIBS) $(X_PRE_LIBS) -lXt -lX11 $(XDPMS_LIBS) -lXext \
 	$(X_EXTRA_LIBS)
 
+xscreensaver-getimage: $(GETIMG_OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm
 
 
 TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \
@@ -678,6 +736,10 @@ test-grab: test-grab.o
 test-apm: test-apm.o
 	$(CC) $(LDFLAGS) -o $@ test-apm.o $(SAVER_LIBS) -lapm
 
+TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
+test-fade: test-fade.o 
+	$(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
+
 
 xdpyinfo.o: xdpyinfo.c
 	$(CC) -c $(INCLUDES) -DHAVE_GLX $(CFLAGS) $(X_CFLAGS) \
@@ -697,71 +759,51 @@ xdpyinfo: xdpyinfo.o
 xscreensaver.o: ../config.h
 xscreensaver.o: $(srcdir)/xscreensaver.h
 xscreensaver.o: $(srcdir)/prefs.h
-xscreensaver.o: $(UTILS_SRC)/version.h
-xscreensaver.o: $(UTILS_SRC)/yarandom.h
-xscreensaver.o: $(UTILS_SRC)/resources.h
-xscreensaver.o: $(UTILS_SRC)/visual.h
-xscreensaver.o: $(UTILS_SRC)/usleep.h
 xscreensaver.o: XScreenSaver_ad.h
 windows.o: ../config.h
 windows.o: $(srcdir)/xscreensaver.h
 windows.o: $(srcdir)/prefs.h
-windows.o: $(UTILS_SRC)/visual.h
-windows.o: $(UTILS_SRC)/fade.h
 timers.o: ../config.h
 timers.o: $(srcdir)/xscreensaver.h
 timers.o: $(srcdir)/prefs.h
 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
 splash.o: ../config.h
 splash.o: $(srcdir)/xscreensaver.h
 splash.o: $(srcdir)/prefs.h
-splash.o: $(UTILS_SRC)/resources.h
 setuid.o: ../config.h
 setuid.o: $(srcdir)/xscreensaver.h
 setuid.o: $(srcdir)/prefs.h
 stderr.o: ../config.h
 stderr.o: $(srcdir)/xscreensaver.h
 stderr.o: $(srcdir)/prefs.h
-stderr.o: $(UTILS_SRC)/resources.h
-stderr.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: $(srcdir)/demo-Gtk-widgets.h
-demo-Gtk.o: $(UTILS_SRC)/logo.xpm
 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
+xscreensaver-getimage.o: ../config.h
+xscreensaver-getimage.o: $(srcdir)/prefs.h
+xscreensaver-getimage.o: XScreenSaver_ad.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
 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
@@ -769,16 +811,15 @@ remote.o: ../config.h
 remote.o: $(srcdir)/remote.h
 xscreensaver-command.o: ../config.h
 xscreensaver-command.o: $(srcdir)/remote.h
-xscreensaver-command.o: $(UTILS_SRC)/version.h
 test-passwd.o: ../config.h
 test-passwd.o: $(srcdir)/xscreensaver.h
 test-passwd.o: $(srcdir)/prefs.h
-test-passwd.o: $(UTILS_SRC)/resources.h
-test-passwd.o: $(UTILS_SRC)/version.h
-test-passwd.o: $(UTILS_SRC)/visual.h
 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
+test-fade.o: ../config.h
+test-fade.o: $(srcdir)/xscreensaver.h
+test-fade.o: $(srcdir)/prefs.h