xscreensaver 6.00v28r1openslx

1 files changed, 23 insertions, 50 deletions

diff --git a/utils/Makefile.in b/utils/Makefile.in
index dbb593b..d624e2f 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,4 +1,4 @@
-# utils/Makefile.in --- xscreensaver, Copyright (c) 1997-2010 Jamie Zawinski.
+# utils/Makefile.in --- xscreensaver, Copyright © 1997-2021 Jamie Zawinski.
 # the `../configure' script generates `utils/Makefile' from this file.
 
 
@@ -102,35 +102,33 @@ X_CFLAGS	= @X_CFLAGS@
 INCLUDES_1	= -I$(srcdir) -I..
 INCLUDES	= $(INCLUDES_1) @INCLUDES@
 
-SRCS		= alpha.c colors.c fade.c grabscreen.c grabclient.c hsv.c \
+SRCS		= alpha.c colors.c grabscreen.c grabclient.c hsv.c \
 		  overlay.c resources.c spline.c usleep.c visual.c \
 		  visual-gl.c xmu.c logo.c yarandom.c erase.c \
 		  xshm.c xdbe.c colorbars.c minixpm.c textclient.c \
 		  textclient-mobile.c aligned_malloc.c thread_util.c \
-		  async_netdb.c xft.c utf8wc.c pow2.c font-retry.c
-OBJS		= alpha.o colors.o fade.o grabscreen.o grabclient.o hsv.o \
+		  async_netdb.c xft.c xftwrap.c utf8wc.c pow2.c font-retry.c
+OBJS		= alpha.o colors.o grabscreen.o grabclient.o hsv.o \
 		  overlay.o resources.o spline.o usleep.o visual.o \
 		  visual-gl.o xmu.o logo.o yarandom.o erase.o \
 		  xshm.o xdbe.o colorbars.o minixpm.o textclient.o \
-		  textclient-mobile.o aligned_malloc.o thread_util.o \
-		  async_netdb.o xft.o utf8wc.o pow2.o \
-		  font-retry.o font-retry-xft.o
-HDRS		= alpha.h colors.h fade.h grabscreen.h hsv.h resources.h \
+		  aligned_malloc.o thread_util.o \
+		  async_netdb.o xft.o xftwrap.o utf8wc.o pow2.o \
+		  font-retry.o
+HDRS		= alpha.h colors.h grabscreen.h hsv.h resources.h \
 		  spline.h usleep.h utils.h version.h visual.h vroot.h xmu.h \
 		  yarandom.h erase.h xshm.h xdbe.h colorbars.h minixpm.h \
 		  xscreensaver-intl.h textclient.h aligned_malloc.h \
-		  thread_util.h async_netdb.h xft.h utf8wc.h pow2.h \
-		  font-retry.h
+		  thread_util.h async_netdb.h xft.h xftwrap.h utf8wc.h pow2.h \
+		  font-retry.h queue.h
 STAR		= *
 LOGOS		= images/$(STAR).xpm \
 		  images/$(STAR).png \
 		  images/$(STAR).gif \
-		  images/$(STAR).eps
+		  images/$(STAR).pdf
 EXTRAS		= README Makefile.in ad2c bin2c
-VMSFILES	= compile_axp.com compile_decc.com vms-gtod.c vms-gtod.h \
-		  vms-strdup.c
 
-TARFILES	= $(EXTRAS) $(VMSFILES) $(SRCS) $(HDRS) $(LOGOS)
+TARFILES	= $(EXTRAS) $(SRCS) $(HDRS) $(LOGOS)
 
 
 default: all
@@ -185,49 +183,24 @@ TAGS: tags
 tags:
 	find $(srcdir) -name '*.[chly]' -print | xargs etags -a
 
-echo_tarfiles:
-	@echo $(TARFILES)
-
+list_tarfiles:
+	@find $(TARFILES) -type f -print | sort
 
 # How we build object files in this directory.
 CCUTILS = $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
 .c.o:
 	$(CC) -c $(CCUTILS) $<
 
-# Two versions of this: driver/ does not link with Xft, but hacks/ does.
-font-retry-xft.o: $(srcdir)/font-retry.c
+font-retry.o: $(srcdir)/font-retry.c
 	$(CC) -c $(CCUTILS) -DUSE_XFT $< -o $@
 
 
-# Rules for generating the VMS makefiles on Unix, so that it doesn't have to
-# be done by hand...
-#
-VMS_AXP_COMPILE=$$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-])
-
-compile_axp.com: Makefile.in
-	@echo generating $@ from $<...  ;				    \
-	( ( for c in $(SRCS) vms-*.c ; do				    \
-	      c=`echo $$c | tr a-z A-Z` ;				    \
-	      echo "$(VMS_AXP_COMPILE) $$c" ;				    \
-            done ;							    \
-	  ) | sort -d ;							    \
-          echo '$$ lib/cre utils.olb_axp' ; 				    \
-	  echo '$$ lib utils.olb_axp *.obj' ; 				    \
-	  echo '$$! delete/noconf *.obj;' ; 				    \
-        ) > $@
-
-compile_decc.com: compile_axp.com
-	@echo generating $@ from $<...  ;				    \
-	sed 's/axp/decc/g' < $< > $@
-
-distdepend:: compile_axp.com compile_decc.com
-
-
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
 
 aligned_malloc.o: $(srcdir)/aligned_malloc.h
+aligned_malloc.o: ../config.h
 alpha.o: $(srcdir)/alpha.h
 alpha.o: ../config.h
 alpha.o: $(srcdir)/hsv.h
@@ -256,11 +229,6 @@ erase.o: $(srcdir)/resources.h
 erase.o: $(srcdir)/usleep.h
 erase.o: $(srcdir)/utils.h
 erase.o: $(srcdir)/yarandom.h
-fade.o: ../config.h
-fade.o: $(srcdir)/fade.h
-fade.o: $(srcdir)/usleep.h
-fade.o: $(srcdir)/utils.h
-fade.o: $(srcdir)/visual.h
 font-retry.o: ../config.h
 font-retry.o: $(srcdir)/font-retry.h
 font-retry.o: $(srcdir)/utils.h
@@ -286,11 +254,11 @@ hsv.o: $(srcdir)/hsv.h
 hsv.o: $(srcdir)/utils.h
 logo.o: ../config.h
 logo.o: $(srcdir)/images/logo-180.xpm
+logo.o: $(srcdir)/images/logo-360.xpm
 logo.o: $(srcdir)/images/logo-50.xpm
 logo.o: $(srcdir)/minixpm.h
 logo.o: $(srcdir)/resources.h
 logo.o: $(srcdir)/utils.h
-logo.o: $(srcdir)/visual.h
 minixpm.o: ../config.h
 minixpm.o: $(srcdir)/minixpm.h
 overlay.o: ../config.h
@@ -328,12 +296,17 @@ xdbe.o: ../config.h
 xdbe.o: $(srcdir)/resources.h
 xdbe.o: $(srcdir)/utils.h
 xdbe.o: $(srcdir)/xdbe.h
+xdbe.o: $(srcdir)/xmu.h
 xft.o: ../config.h
+xftwrap.o: ../config.h
+xftwrap.o: $(srcdir)/utils.h
+xftwrap.o: $(srcdir)/xft.h
+xftwrap.o: $(srcdir)/xftwrap.h
 xmu.o: ../config.h
+xmu.o: $(srcdir)/xmu.h
 xshm.o: $(srcdir)/aligned_malloc.h
 xshm.o: ../config.h
 xshm.o: $(srcdir)/resources.h
-xshm.o: $(srcdir)/thread_util.h
 xshm.o: $(srcdir)/utils.h
 xshm.o: $(srcdir)/xshm.h
 yarandom.o: ../config.h