X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=utils%2FMakefile.in;h=a9cbbefd1809069670b566c17a36ce6389ffe0bc;hp=1f1afcf334b181100e77629a29e3abd0dadc7cc1;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=2d04c4f22466851aedb6ed0f2919d148f726b889

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 1f1afcf3..a9cbbefd 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,4 +1,4 @@
-# utils/Makefile.in --- xscreensaver, Copyright (c) 1997-2005 Jamie Zawinski.
+# utils/Makefile.in --- xscreensaver, Copyright (c) 1997-2010 Jamie Zawinski.
 # the `../configure' script generates `utils/Makefile' from this file.
 
 
@@ -81,6 +81,7 @@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 prefix		= @prefix@
+datarootdir	= @datarootdir@
 
 CC		= @CC@
 CFLAGS		= @CFLAGS@
@@ -98,19 +99,21 @@ INSTALL_DIRS	= @INSTALL_DIRS@
 
 X_CFLAGS	= @X_CFLAGS@
 
-INCLUDES	= -I$(srcdir) -I.. @INCLUDES@
+INCLUDES_1	= -I$(srcdir) -I..
+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
+		  xshm.c xdbe.c colorbars.c minixpm.c textclient.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
+		  xshm.o xdbe.o colorbars.o minixpm.o textclient.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 xscreensaver-intl.h
+		  yarandom.h erase.h xshm.h xdbe.h colorbars.h minixpm.h \
+		  xscreensaver-intl.h textclient.h
 STAR		= *
 LOGOS		= images/$(STAR).xpm \
 		  images/$(STAR).png \
@@ -158,7 +161,7 @@ distdepend::
 	@echo updating dependencies in `pwd`/Makefile.in... ;		    \
 	$(DEPEND) -w 0 -f - 						    \
 	-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
-	$(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --	    \
+	$(INCLUDES_1) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --    \
 	$(SRCS) 2>/dev/null |						    \
 	sort -d |							    \
 	(								    \
@@ -182,7 +185,7 @@ echo_tarfiles:
 
 # How we build object files in this directory.
 .c.o:
-	$(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+	$(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $<
 
 
 # Rules for generating the VMS makefiles on Unix, so that it doesn't have to
@@ -231,6 +234,7 @@ colors.o: $(srcdir)/utils.h
 colors.o: $(srcdir)/visual.h
 colors.o: $(srcdir)/yarandom.h
 erase.o: ../config.h
+erase.o: $(srcdir)/erase.h
 erase.o: $(srcdir)/resources.h
 erase.o: $(srcdir)/usleep.h
 erase.o: $(srcdir)/utils.h
@@ -245,6 +249,7 @@ 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
@@ -260,9 +265,12 @@ hsv.o: $(srcdir)/utils.h
 logo.o: ../config.h
 logo.o: $(srcdir)/images/logo-180.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
 overlay.o: $(srcdir)/utils.h
 overlay.o: $(srcdir)/visual.h
@@ -272,8 +280,13 @@ resources.o: $(srcdir)/utils.h
 spline.o: ../config.h
 spline.o: $(srcdir)/spline.h
 spline.o: $(srcdir)/utils.h
+textclient.o: ../config.h
+textclient.o: $(srcdir)/resources.h
+textclient.o: $(srcdir)/textclient.h
+textclient.o: $(srcdir)/utils.h
 usleep.o: ../config.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