6.09HEADmaster

1 files changed, 19 insertions, 19 deletions

diff --git a/utils/Makefile.in b/utils/Makefile.in
index d624e2f..74781cd 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,4 +1,4 @@
-# utils/Makefile.in --- xscreensaver, Copyright © 1997-2021 Jamie Zawinski.
+# utils/Makefile.in --- xscreensaver, Copyright © 1997-2023 Jamie Zawinski.
 # the `../configure' script generates `utils/Makefile' from this file.
 
 
@@ -102,25 +102,26 @@ X_CFLAGS	= @X_CFLAGS@
 INCLUDES_1	= -I$(srcdir) -I..
 INCLUDES	= $(INCLUDES_1) @INCLUDES@
 
-SRCS		= alpha.c colors.c grabscreen.c grabclient.c hsv.c \
+SRCS		= alpha.c colors.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 xftwrap.c utf8wc.c pow2.c font-retry.c
-OBJS		= alpha.o colors.o grabscreen.o grabclient.o hsv.o \
+		  async_netdb.c xft.c xftwrap.c utf8wc.c pow2.c font-retry.c \
+		  screenshot.c
+OBJS		= alpha.o colors.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 \
 		  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 \
+		  async_netdb.o xft.o xftwrap.o utf8wc.o pow2.o font-retry.o \
+		  screenshot.o
+HDRS		= alpha.h colors.h grabclient.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 xftwrap.h utf8wc.h pow2.h \
-		  font-retry.h queue.h
+		  font-retry.h queue.h screenshot.h
 STAR		= *
 LOGOS		= images/$(STAR).xpm \
 		  images/$(STAR).png \
@@ -130,6 +131,8 @@ EXTRAS		= README Makefile.in ad2c bin2c
 
 TARFILES	= $(EXTRAS) $(SRCS) $(HDRS) $(LOGOS)
 
+# Using $(MAKE) directly means the shell executes things even with "make -n"
+MAKE2 = $(MAKE)
 
 default: all
 all: $(OBJS)
@@ -138,7 +141,7 @@ install:   install-program   install-man
 uninstall: uninstall-program uninstall-man
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE2) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 install-program:
 install-man:
@@ -235,20 +238,13 @@ font-retry.o: $(srcdir)/utils.h
 font-retry.o: $(srcdir)/visual.h
 font-retry.o: $(srcdir)/xft.h
 grabclient.o: ../config.h
-grabclient.o: $(srcdir)/grabscreen.h
+grabclient.o: $(srcdir)/font-retry.h
+grabclient.o: $(srcdir)/grabclient.h
 grabclient.o: $(srcdir)/resources.h
 grabclient.o: $(srcdir)/utils.h
 grabclient.o: $(srcdir)/vroot.h
+grabclient.o: $(srcdir)/xft.h
 grabclient.o: $(srcdir)/yarandom.h
-grabscreen.o: $(srcdir)/colors.h
-grabscreen.o: ../config.h
-grabscreen.o: $(srcdir)/grabscreen.h
-grabscreen.o: $(srcdir)/resources.h
-grabscreen.o: $(srcdir)/usleep.h
-grabscreen.o: $(srcdir)/utils.h
-grabscreen.o: $(srcdir)/visual.h
-grabscreen.o: $(srcdir)/vroot.h
-grabscreen.o: $(srcdir)/yarandom.h
 hsv.o: ../config.h
 hsv.o: $(srcdir)/hsv.h
 hsv.o: $(srcdir)/utils.h
@@ -268,6 +264,10 @@ pow2.o: $(srcdir)/pow2.h
 resources.o: ../config.h
 resources.o: $(srcdir)/resources.h
 resources.o: $(srcdir)/utils.h
+screenshot.o: ../config.h
+screenshot.o: $(srcdir)/../driver/blurb.h
+screenshot.o: $(srcdir)/screenshot.h
+screenshot.o: $(srcdir)/visual.h
 spline.o: ../config.h
 spline.o: $(srcdir)/spline.h
 spline.o: $(srcdir)/utils.h