From http://www.jwz.org/xscreensaver/xscreensaver-5.40.tar.gz

[xscreensaver] / utils / Makefile.in

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 0cd045c459b78f59753f02b5d8a3c327b8640206..56fc602f06155eb64ac66d874a18b83bf899989b 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -105,21 +105,28 @@ INCLUDES  = $(INCLUDES_1) @INCLUDES@
 SRCS           = alpha.c colors.c fade.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
+                 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 \
                  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
+                 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 \
                  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
+                 xscreensaver-intl.h textclient.h aligned_malloc.h \
+                 thread_util.h async_netdb.h xft.h utf8wc.h pow2.h \
+                 font-retry.h
 STAR           = *
 LOGOS          = images/$(STAR).xpm \
                  images/$(STAR).png \
                  images/$(STAR).gif \
                  images/$(STAR).eps
-EXTRAS         = README Makefile.in ad2c
+EXTRAS         = README Makefile.in ad2c bin2c
 VMSFILES       = compile_axp.com compile_decc.com vms-gtod.c vms-gtod.h \
                  vms-strdup.c
 
@@ -172,7 +179,6 @@ distdepend::
              -e 's@ $$(srcdir)/\(.*config.h\)@ \1@g' ;                     \
          echo ''                                                           \
        ) > /tmp/distdepend.$$$$ &&                                         \
-       mv Makefile.in Makefile.in.bak &&                                   \
        mv /tmp/distdepend.$$$$ Makefile.in
 
 TAGS: tags
@@ -184,8 +190,13 @@ echo_tarfiles:
 
 
 # How we build object files in this directory.
+CCUTILS = $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
 .c.o:
-       $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+       $(CC) -c $(CCUTILS) $<
+
+# Two versions of this: driver/ does not link with Xft, but hacks/ does.
+font-retry-xft.o: font-retry.c
+       $(CC) -c $(CCUTILS) -DUSE_XFT $< -o $@
 
 
 # Rules for generating the VMS makefiles on Unix, so that it doesn't have to
@@ -216,6 +227,7 @@ distdepend:: compile_axp.com compile_decc.com
 #
 # DO NOT DELETE: updated by make distdepend
 
+aligned_malloc.o: $(srcdir)/aligned_malloc.h
 alpha.o: $(srcdir)/alpha.h
 alpha.o: ../config.h
 alpha.o: $(srcdir)/hsv.h
@@ -223,8 +235,13 @@ alpha.o: $(srcdir)/resources.h
 alpha.o: $(srcdir)/utils.h
 alpha.o: $(srcdir)/visual.h
 alpha.o: $(srcdir)/yarandom.h
+async_netdb.o: $(srcdir)/aligned_malloc.h
+async_netdb.o: $(srcdir)/async_netdb.h
+async_netdb.o: ../config.h
+async_netdb.o: $(srcdir)/thread_util.h
 colorbars.o: $(srcdir)/colorbars.h
 colorbars.o: ../config.h
+colorbars.o: $(srcdir)/../hacks/ximage-loader.h
 colorbars.o: $(srcdir)/resources.h
 colorbars.o: $(srcdir)/utils.h
 colors.o: $(srcdir)/colors.h
@@ -244,11 +261,17 @@ 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
+font-retry.o: $(srcdir)/visual.h
+font-retry.o: $(srcdir)/xft.h
 grabclient.o: ../config.h
 grabclient.o: $(srcdir)/grabscreen.h
 grabclient.o: $(srcdir)/resources.h
 grabclient.o: $(srcdir)/utils.h
 grabclient.o: $(srcdir)/vroot.h
+grabclient.o: $(srcdir)/yarandom.h
 grabscreen.o: $(srcdir)/colors.h
 grabscreen.o: ../config.h
 grabscreen.o: $(srcdir)/grabscreen.h
@@ -273,14 +296,28 @@ minixpm.o: $(srcdir)/minixpm.h
 overlay.o: ../config.h
 overlay.o: $(srcdir)/utils.h
 overlay.o: $(srcdir)/visual.h
+pow2.o: $(srcdir)/pow2.h
 resources.o: ../config.h
 resources.o: $(srcdir)/resources.h
 resources.o: $(srcdir)/utils.h
 spline.o: ../config.h
 spline.o: $(srcdir)/spline.h
 spline.o: $(srcdir)/utils.h
+textclient-mobile.o: ../config.h
+textclient-mobile.o: $(srcdir)/utils.h
+textclient.o: ../config.h
+textclient.o: $(srcdir)/resources.h
+textclient.o: $(srcdir)/textclient.h
+textclient.o: $(srcdir)/utils.h
+thread_util.o: $(srcdir)/aligned_malloc.h
+thread_util.o: ../config.h
+thread_util.o: $(srcdir)/resources.h
+thread_util.o: $(srcdir)/thread_util.h
 usleep.o: ../config.h
+utf8wc.o: ../config.h
+utf8wc.o: $(srcdir)/utf8wc.h
 visual-gl.o: ../config.h
+visual-gl.o: $(srcdir)/resources.h
 visual-gl.o: $(srcdir)/utils.h
 visual-gl.o: $(srcdir)/visual.h
 visual.o: ../config.h
@@ -291,9 +328,12 @@ xdbe.o: ../config.h
 xdbe.o: $(srcdir)/resources.h
 xdbe.o: $(srcdir)/utils.h
 xdbe.o: $(srcdir)/xdbe.h
+xft.o: ../config.h
 xmu.o: ../config.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