X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=fde4e63cfcbf0cd77e2664a52f1eb653114b2579;hb=3f9592851ce4ed76a9979bfdd6ec7dc5c457e183;hp=6df5137c01fd9ef35fb5a6aa4368830ca1fee89e;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529;p=xscreensaver

diff --git a/driver/Makefile.in b/driver/Makefile.in
index 6df5137c..fde4e63c 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -7,6 +7,8 @@
 
 srcdir		= @srcdir@
 VPATH		= @srcdir@
+top_srcdir	= @top_srcdir@
+top_builddir	= ..
 
 install_prefix	=
 prefix		= @prefix@
@@ -15,23 +17,29 @@ bindir		= @bindir@
 mandir		= @mandir@
 man1dir		= $(mandir)/man1
 mansuffix	= 1
+datadir		= @datadir@
+localedir	= $(datadir)/locale
+
+INTLTOOL_MERGE	= @INTLTOOL_MERGE@
 
 GNOME_DATADIR	= @GNOME_DATADIR@
 GNOME_CCDIR	= $(GNOME_DATADIR)/control-center/Desktop
 GNOME_PANELDIR	= $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
-GNOME_ICONDIR	= $(GNOME_DATADIR)/pixmaps
 GNOME_BINDIR	= $(bindir)
 HACK_CONF_DIR	= @HACK_CONF_DIR@
+GTK_ICONDIR	= @GTK_ICONDIR@
 
 CC		= @CC@
 CFLAGS		= @CFLAGS@
 LDFLAGS		= @LDFLAGS@
 DEFS		= @DEFS@
+INTL_DEFS	= -DLOCALEDIR=\"$(localedir)\"
 SUBP_DEFS	= $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"'
-GTK_DEFS	= $(DEFS) -DDEFAULT_ICONDIR='"$(GNOME_ICONDIR)"'
+GTK_DEFS	= $(DEFS) -DDEFAULT_ICONDIR='"$(GTK_ICONDIR)"'
 CONF_DEFS	= -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"'
 
 LIBS		= @LIBS@
+INTL_LIBS	= @INTLLIBS@
 PERL		= @PERL@
 
 DEPEND		= @DEPEND@
@@ -126,7 +134,7 @@ GL_LIBS		= @SAVER_GL_LIBS@
 
 ICON_SRC        = $(UTILS_SRC)/images
 LOGO		= $(ICON_SRC)/logo-50.xpm
-GNOME_ICONS     = $(ICON_SRC)/screensaver-*.xpm
+GTK_ICONS	= $(ICON_SRC)/screensaver-*.xpm
 
 DEMO_UTIL_SRCS	= $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \
 		  $(UTILS_SRC)/visual.c
@@ -157,9 +165,9 @@ GETIMG_OBJS	= $(GETIMG_OBJS_1) \
 		  $(UTILS_BIN)/colors.o $(UTILS_BIN)/grabscreen.o \
 		  $(UTILS_BIN)/logo.o prefs.o $(XMU_OBJS)
 
-SAVER_SRCS_1	= xscreensaver.c windows.c timers.c subprocs.c \
+SAVER_SRCS_1	= xscreensaver.c windows.c timers.c subprocs.c exec.c \
 		  xset.c splash.c setuid.c stderr.c
-SAVER_OBJS_1	= xscreensaver.o windows.o timers.o subprocs.o \
+SAVER_OBJS_1	= xscreensaver.o windows.o timers.o subprocs.o exec.o \
 		  xset.o splash.o setuid.o stderr.o
 
 SAVER_SRCS	= $(SAVER_SRCS_1) prefs.c dpms.c $(LOCK_SRCS) \
@@ -173,8 +181,8 @@ CMD_OBJS	= remote.o xscreensaver-command.o
 DEMO_SRCS_1	= prefs.c dpms.c $(XMU_SRCS)
 DEMO_OBJS_1	= prefs.o dpms.o $(XMU_OBJS)
 
-DEMO_SRCS	= prefs.c dpms.c remote.c $(DEMO_UTIL_SRCS)
-DEMO_OBJS	= prefs.o dpms.o remote.o $(DEMO_UTIL_OBJS)
+DEMO_SRCS	= prefs.c dpms.c remote.c exec.c $(DEMO_UTIL_SRCS)
+DEMO_OBJS	= prefs.o dpms.o remote.o exec.o $(DEMO_UTIL_OBJS)
 
 SAVER_LIBS	= $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
 		  $(XDPMS_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
@@ -425,8 +433,7 @@ install-pam:
 	fi
 
 install-gnome:: screensaver-properties.desktop
-	@lost1=""							     ;\
-         lost2=""                                                            ;\
+	@lost=""							     ;\
          if [ "$(GNOME_DATADIR)" != "" ]; then                                \
 	                                                                      \
            if [ ! -d "$(install_prefix)$(GNOME_CCDIR)" ]; then                \
@@ -434,14 +441,14 @@ install-gnome:: screensaver-properties.desktop
                   $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)"          ;\
            fi                                                                ;\
 	                                                                      \
-           echo    $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
-             $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop  ;\
+           echo    $(INSTALL_DATA) screensaver-properties.desktop	      \
+             $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop;  \
 	                                                                      \
-           if      $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
-             $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop  ;\
+           if      $(INSTALL_DATA) screensaver-properties.desktop	      \
+             $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop;  \
              then true                                                       ;\
            else                                                               \
-             lost1="$(install_prefix)$(GNOME_CCDIR)"                         ;\
+             lost="$$lost $(install_prefix)$(GNOME_CCDIR)"                   ;\
            fi                                                                ;\
 	                                                                      \
            if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then             \
@@ -449,32 +456,24 @@ install-gnome:: screensaver-properties.desktop
                   $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)"       ;\
            fi                                                                ;\
 	                                                                      \
-           echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
+           echo $(INSTALL_DATA) screensaver-properties.desktop		      \
                         $(GNOME_PANELDIR)/screensaver-properties.desktop     ;\
-           if   $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
+           if   $(INSTALL_DATA) screensaver-properties.desktop		      \
        $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop     ;\
              then true                                                       ;\
            else                                                               \
-             lost2="$(install_prefix)$(GNOME_PANELDIR)"                      ;\
+             lost="$$lost $(install_prefix)$(GNOME_PANELDIR)"                ;\
            fi                                                                ;\
 	                                                                      \
-           if [ "$$lost1" != "" -o "$$lost2" != "" ]; then                    \
+           if [ "$$lost" != "" ]; then                                        \
              e=echo ;                                                         \
  $$e ""                                                                      ;\
  $$e "  ####################################################################";\
- $$e "  Warning: unable to install screensaver-properties.desktop into"      ;\
-                 plurality="this file"                                       ;\
-          if [ "$$lost1" != "" -a "$$lost2" != "" ]; then                     \
- $$e "           $$lost1/ or into"                                           ;\
- $$e "           $$lost2/."                                                  ;\
-                 plurality="these files"                                     ;\
-          elif [ "$$lost1" != "" ]; then                                      \
- $$e "           $$lost1/."                                                  ;\
-          else                                                                \
- $$e "           $$lost2/."                                                  ;\
-          fi                                                                 ;\
- $$e "           Without $$plurality," 'the "Screen Saver" section of the'   ;\
- $$e "           Gnome Control Center (gnomecc) will not work properly."     ;\
+ $$e "  Warning: unable to install screensaver-properties.desktop into:"     ;\
+	set - $$lost							     ;\
+	for f in $$@ ; do echo "             $$f/" ; done                    ;\
+ $$e '           This means the "Screen Saver" section of the Gnome'         ;\
+ $$e "           Control Center (gnomecc) may not work properly."	     ;\
  $$e "  ####################################################################";\
  $$e ""                                                                      ;\
              exit 1 ;                                                         \
@@ -488,9 +487,9 @@ install-gnome:: screensaver-properties-capplet
                   $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)"         ;\
            fi                                                                ;\
 	   program=screensaver-properties-capplet			     ;\
-	   echo $(INSTALL_SCRIPT) $$program				      \
+	   echo $(INSTALL_SCRIPT) $(srcdir)/$$program			      \
 	          $(install_prefix)$(GNOME_BINDIR)/$$program		     ;\
-	   if   $(INSTALL_SCRIPT) $$program				      \
+	   if   $(INSTALL_SCRIPT) $(srcdir)/$$program			      \
 	          $(install_prefix)$(GNOME_BINDIR)/$$program		     ;\
              then true                                                       ;\
            else                                                               \
@@ -509,31 +508,31 @@ install-gnome:: screensaver-properties-capplet
 
 # xscreensaver.xpm
 install-gnome:: $(LOGO)
-	@if [ "$(GNOME_DATADIR)" != "" ]; then                                \
-           if [ ! -d "$(install_prefix)$(GNOME_ICONDIR)" ]; then              \
-             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_ICONDIR)"        ;\
-                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_ICONDIR)"        ;\
+	@if [ "$(GTK_ICONDIR)" != "" ]; then                                  \
+           if [ ! -d "$(install_prefix)$(GTK_ICONDIR)" ]; then                \
+             echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)"          ;\
+                  $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)"          ;\
            fi                                                                ;\
 	   target=xscreensaver.xpm                                           ;\
 	   echo $(INSTALL_DATA) $(LOGO)					      \
-	          $(install_prefix)$(GNOME_ICONDIR)/$$target		     ;\
+	          $(install_prefix)$(GTK_ICONDIR)/$$target		     ;\
 	        $(INSTALL_DATA) $(LOGO)					      \
-	          $(install_prefix)$(GNOME_ICONDIR)/$$target		     ;\
+	          $(install_prefix)$(GTK_ICONDIR)/$$target		     ;\
         fi
 
 # ../utils/images/screensaver-*.xpm
 install-gnome::
-	@if [ "$(GNOME_DATADIR)" != "" ]; then                                \
-           if [ ! -d "$(install_prefix)$(GNOME_ICONDIR)" ]; then              \
-             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_ICONDIR)"        ;\
-                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_ICONDIR)"        ;\
+	@if [ "$(GTK_ICONDIR)" != "" ]; then                                  \
+           if [ ! -d "$(install_prefix)$(GTK_ICONDIR)" ]; then                \
+             echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)"          ;\
+                  $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)"          ;\
            fi                                                                ;\
-	   for target in $(GNOME_ICONS) ; do				      \
+	   for target in $(GTK_ICONS) ; do				      \
 	     dest=`echo $$target | sed 's@^.*/@@'`			     ;\
 	     echo $(INSTALL_DATA) $$target				      \
-	          $(install_prefix)$(GNOME_ICONDIR)/$$dest		     ;\
+	          $(install_prefix)$(GTK_ICONDIR)/$$dest		     ;\
 	          $(INSTALL_DATA) $$target				      \
-	          $(install_prefix)$(GNOME_ICONDIR)/$$dest		     ;\
+	          $(install_prefix)$(GTK_ICONDIR)/$$dest		     ;\
 	   done								     ;\
         fi
 
@@ -557,19 +556,19 @@ uninstall-gnome::
 
 # xscreensaver.xpm
 uninstall-gnome::
-	@if [ "$(GNOME_DATADIR)" != "" ]; then				      \
+	@if [ "$(GTK_ICONDIR)" != "" ]; then				      \
 	  target=xscreensaver.xpm                                            ;\
-	  echo rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target              ;\
-	       rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target              ;\
+	  echo rm -f $(install_prefix)$(GTK_ICONDIR)/$$target                ;\
+	       rm -f $(install_prefix)$(GTK_ICONDIR)/$$target                ;\
 	 fi
 
 # xscreensaver.xpm
 uninstall-gnome::
-	@if [ "$(GNOME_DATADIR)" != "" ]; then				      \
-	   for target in $(GNOME_ICONS) ; do				      \
+	@if [ "$(GTK_ICONDIR)" != "" ]; then				      \
+	   for target in $(GTK_ICONS) ; do				      \
 	     dest=`echo $$target | sed 's@^.*/@@'`			     ;\
-	     echo rm -f $(install_prefix)$(GNOME_ICONDIR)/$$dest             ;\
-	          rm -f $(install_prefix)$(GNOME_ICONDIR)/$$dest             ;\
+	     echo rm -f $(install_prefix)$(GTK_ICONDIR)/$$dest               ;\
+	          rm -f $(install_prefix)$(GTK_ICONDIR)/$$dest               ;\
 	   done								     ;\
         fi
 
@@ -612,7 +611,7 @@ clean:
 	-rm -f *.o a.out core $(EXES) $(EXES2) $(TEST_EXES) XScreenSaver_ad.h
 
 distclean: clean
-	-rm -f Makefile XScreenSaver.ad TAGS *~ "#"*
+	-rm -f Makefile XScreenSaver.ad TAGS *~ "#"* screensaver-properties.desktop
 
 # Adds all current dependencies to Makefile
 depend: XScreenSaver_ad.h
@@ -629,13 +628,16 @@ distdepend: update_ad_version update_man_version XScreenSaver_ad.h
 	@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) -I$(ICON_SRC) $(DEFS) $(DEPEND_DEFINES)		    \
+	$(CFLAGS) $(X_CFLAGS) --					    \
 	$(SAVER_SRCS_1) $(MOTIF_SRCS) $(GTK_SRCS) $(GETIMG_SRCS_1)	    \
 	$(PWENT_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS)		    \
-	$(TEST_SRCS) |							    \
+	$(TEST_SRCS) 2>/dev/null |					    \
+	sort -d |							    \
 	(								    \
 	  awk '/^# .*Makefile.in ---/,/^# DO .*distdepend/' < Makefile.in ; \
-	  sed -e 's@ \./@ @g;s@ /[^ ]*@@g;/^.*:$$/d'			    \
+	  sed -e '/^#.*/d'						    \
+	      -e 's@ \./@ @g;s@ /[^ ]*@@g;/^.*:$$/d'			    \
 	      -e 's@\.\./utils@$$(UTILS_SRC)@g'				    \
 	      -e 's@ \([^$$]\)@ $$(srcdir)/\1@g'			    \
 	      -e 's@$$.*\(XScreenSaver_ad\)@\1@g'			    \
@@ -723,10 +725,10 @@ subprocs.o: subprocs.c
 	$(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CFLAGS) $(X_CFLAGS) \
 	  $(srcdir)/subprocs.c
 
-# demo-Gtk takes an extra -D option, and an extra -I option.
+# demo-Gtk takes extra -D options, and an extra -I option.
 demo-Gtk.o: demo-Gtk.c
-	$(CC) -c $(INCLUDES) $(SUBP_DEFS) -I$(ICON_SRC) $(GTK_DEFS) \
-	  $(CFLAGS) $(X_CFLAGS) \
+	$(CC) -c $(INCLUDES) $(SUBP_DEFS) -I$(ICON_SRC) \
+	  $(GTK_DEFS) $(INTL_DEFS) $(CFLAGS) $(X_CFLAGS) \
 	  $(srcdir)/demo-Gtk.c
 
 # demo-Gtk-conf takes an extra -D option.
@@ -740,11 +742,7 @@ demo-Gtk-conf.o: demo-Gtk-conf.c
 XScreenSaver_ad.h: XScreenSaver.ad
 	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver.ad > XScreenSaver_ad.h
 
-screensaver-properties.desktop: screensaver-properties.desktop.in Makefile
-	@echo generating $@... ;					\
-	sed "s%[@]bindir[@]%${bindir}%g"				\
-	  < ${srcdir}/screensaver-properties.desktop.in			\
-	  > $@
+@INTLTOOL_DESKTOP_RULE@
 
 # The executables linked in this directory.
 #
@@ -756,17 +754,18 @@ xscreensaver-command: $(CMD_OBJS)
 
 
 xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@
-	cp -p @PREFERRED_DEMO_PROGRAM@ $@
+	cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@
+#	$(INSTALL_PROGRAM) @PREFERRED_DEMO_PROGRAM@ $@
 
 xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \
-	$(MOTIF_LIBS) $(X_PRE_LIBS) -lXt -lX11 $(XDPMS_LIBS) -lXext \
-	$(X_EXTRA_LIBS)
+	$(MOTIF_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \
+	$(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS)
 
 xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \
-	$(GTK_LIBS) $(XML_LIBS) $(X_PRE_LIBS) -lXt -lX11 $(XDPMS_LIBS) -lXext \
-	$(X_EXTRA_LIBS)
+	$(GTK_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
@@ -811,79 +810,79 @@ xdpyinfo: xdpyinfo.o
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
-# $(srcdir)/DO $(srcdir)/NOT $(srcdir)/DELETE: $(srcdir)/updated $(srcdir)/by $(srcdir)/make $(srcdir)/distdepend
 
-xscreensaver.o: ../config.h
-xscreensaver.o: $(srcdir)/xscreensaver.h
-xscreensaver.o: $(srcdir)/prefs.h
-xscreensaver.o: XScreenSaver_ad.h
-windows.o: ../config.h
-windows.o: $(srcdir)/xscreensaver.h
-windows.o: $(srcdir)/prefs.h
-timers.o: ../config.h
-timers.o: $(srcdir)/xscreensaver.h
-timers.o: $(srcdir)/prefs.h
-subprocs.o: ../config.h
-subprocs.o: $(srcdir)/xscreensaver.h
-subprocs.o: $(srcdir)/prefs.h
-xset.o: ../config.h
-xset.o: $(srcdir)/xscreensaver.h
-xset.o: $(srcdir)/prefs.h
-splash.o: ../config.h
-splash.o: $(srcdir)/xscreensaver.h
-splash.o: $(srcdir)/prefs.h
-setuid.o: ../config.h
-setuid.o: $(srcdir)/xscreensaver.h
-setuid.o: $(srcdir)/prefs.h
-stderr.o: ../config.h
-stderr.o: $(srcdir)/xscreensaver.h
-stderr.o: $(srcdir)/prefs.h
-demo-Xm.o: ../config.h
-demo-Xm.o: $(srcdir)/prefs.h
-demo-Xm.o: $(srcdir)/remote.h
-demo-Xm.o: XScreenSaver_ad.h
-demo-Xm-widgets.o: ../config.h
+demo-Gtk-conf.o: ../config.h
+demo-Gtk-conf.o: $(srcdir)/demo-Gtk-conf.h
+demo-Gtk.o: XScreenSaver_ad.h
 demo-Gtk.o: ../config.h
+demo-Gtk.o: $(srcdir)/demo-Gtk-conf.h
+demo-Gtk.o: $(srcdir)/demo-Gtk-support.h
+demo-Gtk.o: $(srcdir)/demo-Gtk-widgets.h
 demo-Gtk.o: $(srcdir)/prefs.h
 demo-Gtk.o: $(srcdir)/remote.h
-demo-Gtk.o: $(srcdir)/demo-Gtk-widgets.h
-demo-Gtk.o: $(srcdir)/demo-Gtk-support.h
-demo-Gtk.o: $(srcdir)/demo-Gtk-conf.h
-demo-Gtk.o: XScreenSaver_ad.h
-demo-Gtk-conf.o: ../config.h
-demo-Gtk-conf.o: $(srcdir)/demo-Gtk-conf.h
+demo-Gtk-support.o: ../config.h
+demo-Gtk-support.o: $(srcdir)/demo-Gtk-support.h
 demo-Gtk-widgets.o: ../config.h
 demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-stubs.h
-demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.h
 demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-support.h
-demo-Gtk-support.o: ../config.h
-demo-Gtk-support.o: $(srcdir)/demo-Gtk-support.h
-xscreensaver-getimage.o: ../config.h
-xscreensaver-getimage.o: $(srcdir)/prefs.h
-xscreensaver-getimage.o: XScreenSaver_ad.h
-passwd-pwent.o: ../config.h
+demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.h
+demo-Xm.o: XScreenSaver_ad.h
+demo-Xm.o: ../config.h
+demo-Xm.o: $(srcdir)/prefs.h
+demo-Xm.o: $(srcdir)/remote.h
+demo-Xm-widgets.o: ../config.h
+dpms.o: ../config.h
+dpms.o: $(srcdir)/prefs.h
+dpms.o: $(srcdir)/xscreensaver.h
+exec.o: ../config.h
 lock.o: ../config.h
-lock.o: $(srcdir)/xscreensaver.h
 lock.o: $(srcdir)/prefs.h
+lock.o: $(srcdir)/xscreensaver.h
 passwd.o: ../config.h
+passwd-pwent.o: ../config.h
 prefs.o: ../config.h
 prefs.o: $(srcdir)/prefs.h
-dpms.o: ../config.h
-dpms.o: $(srcdir)/xscreensaver.h
-dpms.o: $(srcdir)/prefs.h
 remote.o: ../config.h
 remote.o: $(srcdir)/remote.h
-xscreensaver-command.o: ../config.h
-xscreensaver-command.o: $(srcdir)/remote.h
+setuid.o: ../config.h
+setuid.o: $(srcdir)/prefs.h
+setuid.o: $(srcdir)/xscreensaver.h
+splash.o: ../config.h
+splash.o: $(srcdir)/prefs.h
+splash.o: $(srcdir)/xscreensaver.h
+stderr.o: ../config.h
+stderr.o: $(srcdir)/prefs.h
+stderr.o: $(srcdir)/xscreensaver.h
+subprocs.o: ../config.h
+subprocs.o: $(srcdir)/prefs.h
+subprocs.o: $(srcdir)/xscreensaver.h
+test-apm.o: ../config.h
+test-fade.o: ../config.h
+test-fade.o: $(srcdir)/prefs.h
+test-fade.o: $(srcdir)/xscreensaver.h
+test-grab.o: ../config.h
+test-passwd.o: XScreenSaver_ad.h
 test-passwd.o: ../config.h
-test-passwd.o: $(srcdir)/xscreensaver.h
 test-passwd.o: $(srcdir)/prefs.h
-test-passwd.o: XScreenSaver_ad.h
+test-passwd.o: $(srcdir)/xscreensaver.h
 test-uid.o: ../config.h
 test-xdpms.o: ../config.h
-test-grab.o: ../config.h
-test-apm.o: ../config.h
-test-fade.o: ../config.h
-test-fade.o: $(srcdir)/xscreensaver.h
-test-fade.o: $(srcdir)/prefs.h
+timers.o: ../config.h
+timers.o: $(srcdir)/prefs.h
+timers.o: $(srcdir)/xscreensaver.h
+windows.o: ../config.h
+windows.o: $(srcdir)/prefs.h
+windows.o: $(srcdir)/xscreensaver.h
+xscreensaver-command.o: ../config.h
+xscreensaver-command.o: $(srcdir)/remote.h
+xscreensaver-getimage.o: ../config.h
+xscreensaver-getimage.o: XScreenSaver_ad.h
+xscreensaver-getimage.o: $(srcdir)/prefs.h
+xscreensaver.o: XScreenSaver_ad.h
+xscreensaver.o: ../config.h
+xscreensaver.o: $(srcdir)/prefs.h
+xscreensaver.o: $(srcdir)/xscreensaver.h
+xset.o: ../config.h
+xset.o: $(srcdir)/prefs.h
+xset.o: $(srcdir)/xscreensaver.h