X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FMakefile.in;h=2830471053e7c9ffa7692d9def6bf4c68f6bbc3e;hp=b7d308280470f7ef75405eee9210210ad760c0b5;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=96a411663168b0ba5432b407a83be55f3df0c802

diff --git a/driver/Makefile.in b/driver/Makefile.in
index b7d30828..28304710 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -1,4 +1,4 @@
-# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-1999 Jamie Zawinski.
+# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-2004 Jamie Zawinski.
 # the `../configure' script generates `driver/Makefile' from this file.
 
 @SET_MAKE@
@@ -111,15 +111,20 @@ KERBEROS_OBJS	= passwd-kerberos.o
 PAM_SRCS	= passwd-pam.c
 PAM_OBJS	= passwd-pam.o
 
+PWHELPER_SRCS	= passwd-helper.c
+PWHELPER_OBJS	= passwd-helper.o
+
 LOCK_SRCS_1	= lock.c passwd.c
 LOCK_OBJS_1	= lock.o passwd.o
 NOLOCK_SRCS_1	= lock.c
 NOLOCK_OBJS_1	= lock.o
 
-TEST_SRCS	= test-passwd.c test-uid.c test-xdpms.c test-grab.c \
-		  test-apm.c test-fade.c test-xinerama.c xdpyinfo.c
-TEST_EXES	= test-passwd   test-uid   test-xdpms   test-grab \
-		  test-apm   test-fade   test-xinerama   xdpyinfo
+TEST_SRCS	= test-passwd.c test-uid.c  test-xdpms.c    test-grab.c \
+		  test-apm.c    test-fade.c test-xinerama.c test-vp.c   \
+	          test-randr.c  xdpyinfo.c
+TEST_EXES	= test-passwd   test-uid    test-xdpms      test-grab   \
+		  test-apm      test-fade   test-xinerama   test-vp     \
+		  test-randr    xdpyinfo
 
 MOTIF_LIBS	= @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
 GTK_LIBS	= @GTK_LIBS@ $(XMU_LIBS)
@@ -240,7 +245,7 @@ VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
 		  vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt
 
 TARFILES	= $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) \
-		  $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) \
+		  $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) $(PWHELPER_SRCS) \
 		  $(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \
 		  $(CMD_SRCS) $(GETIMG_SRCS_1) $(PDF2JPEG_SRCS) $(HDRS) \
 		  $(SCRIPTS_1) $(SCRIPTS_OSX) $(MEN_1) $(MEN_OSX) \
@@ -892,8 +897,8 @@ xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS)
 
 xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \
-	$(GTK_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \
-	$(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS)
+	$(GTK_LIBS) $(XPM_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) \
+	-lXt -lX11 $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS)
 
 xscreensaver-getimage: $(GETIMG_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm
@@ -921,6 +926,14 @@ test-xinerama: test-xinerama.o
 	$(CC) $(LDFLAGS) -o $@ test-xinerama.o $(LIBS) $(X_LIBS) $(SAVER_LIBS)\
 	$(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
 
+test-vp: test-vp.o
+	$(CC) $(LDFLAGS) -o $@ test-vp.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \
+	$(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
+
+test-randr: test-randr.o
+	$(CC) $(LDFLAGS) -o $@ test-randr.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \
+	$(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
+
 test-grab: test-grab.o
 	$(CC) $(LDFLAGS) -o $@ test-grab.o $(SAVER_LIBS)
 
@@ -997,7 +1010,9 @@ test-passwd.o: ../config.h
 test-passwd.o: $(srcdir)/prefs.h
 test-passwd.o: XScreenSaver_ad.h
 test-passwd.o: $(srcdir)/xscreensaver.h
+test-randr.o: ../config.h
 test-uid.o: ../config.h
+test-vp.o: ../config.h
 test-xdpms.o: ../config.h
 test-xinerama.o: ../config.h
 timers.o: ../config.h