http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.04.2.tar.gz
[xscreensaver] / driver / Makefile.in
index 563e9028ed356a17f4c1d829f3775f17fc5dd08f..f7012a66f224fbe4e19fb89cd38abffea4aba6fc 100644 (file)
@@ -7,6 +7,8 @@
 
 srcdir         = @srcdir@
 VPATH          = @srcdir@
+top_srcdir     = @top_srcdir@
+top_builddir   = ..
 
 install_prefix =
 prefix         = @prefix@
@@ -15,12 +17,17 @@ bindir              = @bindir@
 mandir         = @mandir@
 man1dir                = $(mandir)/man1
 mansuffix      = 1
+datadir                = @datadir@
+localedir      = $(datadir)/locale
+
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
 
 GNOME_DATADIR  = @GNOME_DATADIR@
-GNOME_CCDIR_1  = $(GNOME_DATADIR)/control-center/Desktop
-GNOME_CCDIR_2  = $(GNOME_DATADIR)/control-center/capplets
-GNOME_PANELDIR = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
-GNOME_ICONDIR  = $(GNOME_DATADIR)/pixmaps
+GNOME_CCDIR    = $(GNOME_DATADIR)/control-center/Desktop
+GNOME_PANELDIR1 = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
+GNOME_PANELDIR2        = $(GNOME_DATADIR)/applications
+GNOME_PANELDIR = @GNOME_PANELDIR@
+GLADE_DATADIR  = @GLADE_DATADIR@
 GNOME_BINDIR   = $(bindir)
 HACK_CONF_DIR  = @HACK_CONF_DIR@
 
@@ -28,11 +35,13 @@ 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='"$(GLADE_DATADIR)"'
 CONF_DEFS      = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"'
 
 LIBS           = @LIBS@
+INTL_LIBS      = @INTLLIBS@
 PERL           = @PERL@
 
 DEPEND         = @DEPEND@
@@ -53,6 +62,7 @@ X_LIBS                = @X_LIBS@
 X_PRE_LIBS     = @X_PRE_LIBS@
 X_EXTRA_LIBS   = @X_EXTRA_LIBS@
 XMU_LIBS       = @XMU_LIBS@
+XPM_LIBS       = @XPM_LIBS@
 
 # Note:
 #
@@ -83,8 +93,8 @@ MOTIF_OBJS    = demo-Xm.o demo-Xm-widgets.o
 
 GTK_SRCS       = demo-Gtk.c demo-Gtk-conf.c \
                  demo-Gtk-widgets.c demo-Gtk-support.c
-GTK_OBJS       = demo-Gtk.o demo-Gtk-conf.o \
-                 demo-Gtk-widgets.o demo-Gtk-support.o
+GTK_EXTRA_OBJS  = demo-Gtk-widgets.o demo-Gtk-support.o
+GTK_OBJS       = demo-Gtk.o demo-Gtk-conf.o @GTK_EXTRA_OBJS@
 
 PWENT_SRCS     = passwd-pwent.c
 PWENT_OBJS     = passwd-pwent.o
@@ -127,7 +137,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
@@ -185,7 +195,7 @@ SAVER_LIBS  = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
 CMD_LIBS       = $(LIBS) $(X_LIBS) \
                  $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
 
-GETIMG_LIBS    = $(LIBS) $(X_LIBS) \
+GETIMG_LIBS    = $(LIBS) $(X_LIBS) $(XPM_LIBS) \
                  $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS)
 
 EXES           = xscreensaver xscreensaver-command xscreensaver-demo \
@@ -202,7 +212,7 @@ MEN         = xscreensaver.man xscreensaver-demo.man \
                  xscreensaver-getimage-file.man \
                  xscreensaver-getimage-video.man
 EXTRAS         = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
-                 xscreensaver.kss xscreensaver-demo.glade \
+                 xscreensaver.kss xscreensaver-demo.glade xscreensaver-demo.glade2 \
                  screensaver-properties.desktop.in \
                  screensaver-properties-capplet \
                  .gdbinit
@@ -429,33 +439,19 @@ install-gnome:: screensaver-properties.desktop
        @lost=""                                                             ;\
          if [ "$(GNOME_DATADIR)" != "" ]; then                                \
                                                                              \
-           if [ ! -d "$(install_prefix)$(GNOME_CCDIR_1)" ]; then              \
-             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
-                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
-           fi                                                                ;\
-           if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then              \
-             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)"        ;\
-                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)"        ;\
+           if [ ! -d "$(install_prefix)$(GNOME_CCDIR)" ]; then                \
+             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)"          ;\
+                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)"          ;\
            fi                                                                ;\
                                                                              \
-           echo    $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
-             $(install_prefix)$(GNOME_CCDIR_1)/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_1)/screensaver-properties.desktop;\
+           if      $(INSTALL_DATA) screensaver-properties.desktop            \
+             $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop;  \
              then true                                                       ;\
            else                                                               \
-             lost="$$lost $(install_prefix)$(GNOME_CCDIR_1)"                 ;\
-           fi                                                                ;\
-                                                                             \
-           echo    $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
-             $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop           ;\
-                                                                             \
-           if      $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
-             $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop           ;\
-             then true                                                       ;\
-           else                                                               \
-             lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)"                 ;\
+             lost="$$lost $(install_prefix)$(GNOME_CCDIR)"                   ;\
            fi                                                                ;\
                                                                              \
            if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then             \
@@ -463,9 +459,9 @@ 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                                                               \
@@ -494,9 +490,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                                                               \
@@ -515,34 +511,62 @@ 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 [ "$(GLADE_DATADIR)" != "" ]; then                                  \
+           if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then                \
+             echo $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)"          ;\
+                  $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)"          ;\
            fi                                                                ;\
           target=xscreensaver.xpm                                           ;\
           echo $(INSTALL_DATA) $(LOGO)                                       \
-                 $(install_prefix)$(GNOME_ICONDIR)/$$target                 ;\
+                 $(install_prefix)$(GLADE_DATADIR)/$$target                 ;\
                $(INSTALL_DATA) $(LOGO)                                       \
-                 $(install_prefix)$(GNOME_ICONDIR)/$$target                 ;\
+                 $(install_prefix)$(GLADE_DATADIR)/$$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 [ "$(GLADE_DATADIR)" != "" ]; then                                \
+           if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then              \
+             echo $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)"        ;\
+                  $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)"        ;\
            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)$(GLADE_DATADIR)/$$dest                   ;\
                  $(INSTALL_DATA) $$target                                    \
-                 $(install_prefix)$(GNOME_ICONDIR)/$$dest                   ;\
+                 $(install_prefix)$(GLADE_DATADIR)/$$dest                   ;\
           done                                                              ;\
         fi
 
+# xscreensaver-demo.glade2
+install-gnome:: xscreensaver-demo.glade2
+       @if [ "$(GLADE_DATADIR)" != "" ]; then                                \
+         if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then               \
+           echo $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)"         ;\
+                $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)"         ;\
+         fi                                                                 ;\
+         target=xscreensaver-demo.glade2                                    ;\
+         echo $(INSTALL_DATA) $(srcdir)/$$target                             \
+           $(install_prefix)$(GLADE_DATADIR)/$$target                       ;\
+         if   $(INSTALL_DATA) $(srcdir)/$$target                             \
+           $(install_prefix)$(GLADE_DATADIR)/$$target                       ;\
+           then true                                                        ;\
+          else                                                                \
+           e=echo ;                                                          \
+ $$e ""                                                                      ;\
+ $$e "  ####################################################################";\
+ $$e "  Warning: unable to install $$target into"                           ;\
+ $$e "           $(install_prefix)$(GLADE_DATADIR)/."                        ;\
+ $$e "           Without this file, xscreensaver-demo will not"              ;\
+ $$e "           be able to run properly."                                   ;\
+ $$e "  ####################################################################";\
+ $$e ""                                                                      ;\
+             exit 1 ;                                                         \
+          fi ;                                                               \
+        fi
+
+
 # screensaver-properties.desktop
 uninstall-gnome::
        @if [ "$(GNOME_DATADIR)" != "" ]; then                                \
@@ -563,19 +587,19 @@ uninstall-gnome::
 
 # xscreensaver.xpm
 uninstall-gnome::
-       @if [ "$(GNOME_DATADIR)" != "" ]; then                                \
+       @if [ "$(GLADE_DATADIR)" != "" ]; then                                \
          target=xscreensaver.xpm                                            ;\
-         echo rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target              ;\
-              rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target              ;\
+         echo rm -f $(install_prefix)$(GLADE_DATADIR)/$$target                ;\
+              rm -f $(install_prefix)$(GLADE_DATADIR)/$$target                ;\
         fi
 
 # xscreensaver.xpm
 uninstall-gnome::
-       @if [ "$(GNOME_DATADIR)" != "" ]; then                                \
-          for target in $(GNOME_ICONS) ; do                                  \
+       @if [ "$(GLADE_DATADIR)" != "" ]; 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)$(GLADE_DATADIR)/$$dest             ;\
+                 rm -f $(install_prefix)$(GLADE_DATADIR)/$$dest             ;\
           done                                                              ;\
         fi
 
@@ -618,7 +642,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
@@ -631,17 +655,20 @@ depend: XScreenSaver_ad.h
 # close.  This excludes dependencies on files in /usr/include, etc.  It tries
 # to include only dependencies on files which are themselves a part of this
 # package.
-distdepend: update_ad_version update_man_version XScreenSaver_ad.h
+distdepend: check_men 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'                           \
@@ -661,7 +688,7 @@ update_ad_version::
        V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ;             \
        D=`date '+%d-%b-%Y'` ;                                              \
        for S in $$files ; do                                               \
-         echo -n "Updating version number in $$S to $$V $$D... " ;         \
+         echo -n "Updating $$S to $$V $$D... " ;                           \
          T=/tmp/xs.$$$$ ;                                                  \
          sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*\(.*\)/\1$$V\2/"       \
              -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/"   \
@@ -680,7 +707,7 @@ update_man_version::
        U=$(UTILS_SRC)/version.h ;                                          \
        V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ;             \
        V="`date '+%d-%b-%Y'` ($$V)" ;                                      \
-       echo -n "Updating footer in $$S to \"$$V\"... " ;                   \
+       echo -n "Updating $$S to \"$$V\"... " ;                             \
        T=/tmp/xs.$$$$ ;                                                    \
        sed "s/^\(\.TH[^\"]*\)\"[^\"]*\"\(.*\)/\1\"$$V\"\2/"                \
          < $$S > $$T ;                                                     \
@@ -701,6 +728,23 @@ echo_tarfiles:
        @$(MAKE) XScreenSaver_ad.h 2>&1 >&- /dev/null
        @echo $(TARFILES)
 
+check_men:
+       @badmen="" ;                                                    \
+        for exe in $(EXES); do                                         \
+          if ! [ -f $(srcdir)/$$exe.man ]; then                        \
+            badmen="$$badmen $$exe" ;                                  \
+          fi ;                                                         \
+        done ;                                                         \
+        if [ -n "$$badmen" ]; then                                     \
+          echo "" ;                                                    \
+          echo "Warning: The following programs have no manuals:" ;    \
+          echo "" ;                                                    \
+          for m in $$badmen ; do                                       \
+            echo "    $$m" ;                                           \
+          done ;                                                       \
+          echo "" ;                                                    \
+        fi
+
 
 # Rules for noticing when the objects from the utils directory are out of
 # date with respect to their sources, and going and building them according
@@ -729,10 +773,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.
@@ -746,11 +790,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.
 #
@@ -762,17 +802,18 @@ xscreensaver-command: $(CMD_OBJS)
 
 
 xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@
-       $(INSTALL_PROGRAM) @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
@@ -817,80 +858,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
-exec.o: ../config.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