X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2FMakefile.in;h=56fc602f06155eb64ac66d874a18b83bf899989b;hb=HEAD;hp=ea5f114470442dddc9ba1358a3ab2b8b93b12187;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver

diff --git a/utils/Makefile.in b/utils/Makefile.in
index ea5f1144..56fc602f 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -107,24 +107,26 @@ SRCS		= alpha.c colors.c fade.c grabscreen.c grabclient.c hsv.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
+		  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 textclient.o \
 		  textclient-mobile.o aligned_malloc.o thread_util.o \
-		  async_netdb.o xft.o utf8wc.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 textclient.h aligned_malloc.h \
-		  thread_util.h async_netdb.h xft.h utf8wc.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
 
@@ -177,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
@@ -189,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) $(CPPFLAGS) $(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
@@ -235,6 +241,7 @@ 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
@@ -254,6 +261,11 @@ 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
@@ -284,6 +296,7 @@ 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
@@ -317,8 +330,10 @@ 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