X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=f1d0ca549a9bb2fc88acf5f2636b64ba432db24a;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hp=d10f3d3eb1d9ff48cf3bf980b1be633ddde5f0c0;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;p=xscreensaver

diff --git a/driver/Makefile.in b/driver/Makefile.in
index d10f3d3e..f1d0ca54 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-2005 Jamie Zawinski.
 # the `../configure' script generates `driver/Makefile' from this file.
 
 @SET_MAKE@
@@ -119,10 +119,12 @@ 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)
@@ -236,7 +238,6 @@ EXTRAS		= README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
 		  xscreensaver-demo.glade2p \
 		  screensaver-properties.desktop.in \
 		  screensaver-properties-capplet \
-		  xscreensaver.kss.in \
 		  .gdbinit
 VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
 		  vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
@@ -255,9 +256,9 @@ all: $(EXES) $(EXES2)
 tests: $(TEST_EXES)
 
 install:   install-program   install-ad    install-scripts \
-	   install-gnome     install-kde   install-man   @INSTALL_PAM@
+	   install-gnome     install-man   @INSTALL_PAM@
 uninstall: uninstall-program uninstall-ad  \
-	   uninstall-gnome   uninstall-kde uninstall-man
+	   uninstall-gnome   uninstall-man
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
@@ -676,42 +677,6 @@ uninstall-gnome::
 	   done								     ;\
         fi
 
-# xscreensaver.kss
-install-kde:
-	@src="xscreensaver.kss" ;					      \
-	if [ "$$KDEDIR" != "" ]; then					      \
-	  dir="$(install_prefix)$$KDEDIR/bin" ;				      \
-	  dest="$$dir/$$src" ;						      \
-	  echo $(INSTALL_SCRIPT) $$src $$dest ;				      \
-	  if $(INSTALL_SCRIPT) $$src $$dest ; then			      \
-	    true ;							      \
-	  else								      \
-	    e=echo ;							      \
- $$e ""									     ;\
- $$e "  ####################################################################";\
- $$e "  Warning: unable to install $$dest"				     ;\
-	    if [ ! -d $(install_prefix)$$KDEDIR ]; then			      \
- $$e "           $(install_prefix)$$KDEDIR (\$$KDEDIR) does not exist."	     ;\
-	    elif [ ! -d $(install_prefix)$$KDEDIR/bin ]; then		      \
- $$e "           $(install_prefix)$$KDEDIR/bin (\$$KDEDIR/bin) does not exist.";\
-	    elif [ -f $$dest ]; then					      \
- $$e "           That file exists, and is unwritable."			     ;\
-	    else							      \
- $$e "           The directory is unwritable."				     ;\
-	    fi								     ;\
- $$e "  ####################################################################";\
- $$e ""									     ;\
-	    exit 1 ;							      \
-	  fi ;								      \
-	fi
-
-uninstall-kde:
-	@if [ "$$KDEDIR" != "" ]; then					\
-	  dest="$(install_prefix)$$KDEDIR/bin/xscreensaver.kss" ;	\
-	  echo rm -f $$dest ;						\
-	  rm -f $$dest ;						\
-	fi
-
 clean:
 	-rm -f *.o a.out core $(EXES) $(EXES2) $(TEST_EXES) XScreenSaver_ad.h
 
@@ -895,8 +860,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
@@ -924,6 +889,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)
 
@@ -1000,7 +973,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