projects / xscreensaver / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.09.tar.gz
[xscreensaver] / driver / Makefile.in
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 3c0f796662c5e08aeda347e3996bf14a41268e51..a6348f1c4439e4d6c62a28dcad55864491f5405a 100644 (file)
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -14,6 +14,7 @@ install_prefix        =
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@
 bindir         = @bindir@
+datarootdir    = @datarootdir@
 datadir                = @datadir@
 localedir      = $(datadir)/locale
 mandir         = @mandir@
@@ -115,10 +116,10 @@ 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 test-vp.c   \
-                 test-randr.c  xdpyinfo.c
+                 test-randr.c  xdpyinfo.c  test-mlstring.c test-screens.c
 TEST_EXES      = test-passwd   test-uid    test-xdpms      test-grab   \
                  test-apm      test-fade   test-xinerama   test-vp     \
-                 test-randr    xdpyinfo
+                 test-randr    xdpyinfo    test-mlstring   test-screens
 
 MOTIF_LIBS     = @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
 GTK_LIBS       = @GTK_LIBS@ $(XMU_LIBS)
@@ -146,9 +147,9 @@ LOGO                = $(ICON_SRC)/logo-50.xpm
 GTK_ICONS      = $(ICON_SRC)/screensaver-*.png
 
 DEMO_UTIL_SRCS = $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \
-                 $(UTILS_SRC)/visual.c
+                 $(UTILS_SRC)/visual.c $(XMU_SRCS)
 DEMO_UTIL_OBJS = $(UTILS_BIN)/resources.o $(UTILS_BIN)/usleep.o \
-                 $(UTILS_BIN)/visual.o
+                 $(UTILS_BIN)/visual.o $(XMU_OBJS)
 
 SAVER_UTIL_SRCS        = $(UTILS_SRC)/fade.c $(UTILS_SRC)/overlay.c \
                  $(UTILS_SRC)/logo.c $(UTILS_SRC)/yarandom.c \
@@ -178,24 +179,24 @@ GETIMG_OBJS       = $(GETIMG_OBJS_1) \
                  $(UTILS_BIN)/logo.o $(UTILS_BIN)/minixpm.o prefs.o \
                  $(XMU_OBJS)
 
-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 exec.o \
-                 xset.o splash.o setuid.o stderr.o
+SAVER_SRCS_1   = xscreensaver.c windows.c screens.c timers.c subprocs.c \
+                 exec.c xset.c splash.c setuid.c stderr.c mlstring.c
+SAVER_OBJS_1   = xscreensaver.o windows.o screens.o timers.o subprocs.o \
+                 exec.o xset.o splash.o setuid.o stderr.o mlstring.o
 
 SAVER_SRCS     = $(SAVER_SRCS_1) prefs.c dpms.c $(LOCK_SRCS) \
-                 $(SAVER_UTIL_SRCS) $(GL_SRCS) $(XMU_SRCS)
+                 $(SAVER_UTIL_SRCS) $(GL_SRCS)
 SAVER_OBJS     = $(SAVER_OBJS_1) prefs.o dpms.o $(LOCK_OBJS) \
-                 $(SAVER_UTIL_OBJS) $(GL_OBJS) $(XMU_OBJS)
+                 $(SAVER_UTIL_OBJS) $(GL_OBJS)
 
 CMD_SRCS       = remote.c xscreensaver-command.c
 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_1    = prefs.c dpms.c
+DEMO_OBJS_1    = prefs.o dpms.o
 
-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)
+DEMO_SRCS      = $(DEMO_SRCS_1) remote.c exec.c $(DEMO_UTIL_SRCS)
+DEMO_OBJS      = $(DEMO_OBJS_1) remote.o exec.o $(DEMO_UTIL_OBJS)
 
 PDF2JPEG_SRCS  = pdf2jpeg.m
 PDF2JPEG_OBJS  = pdf2jpeg.o
@@ -225,7 +226,7 @@ SCRIPTS             = $(SCRIPTS_1) @SCRIPTS_OSX@
 HDRS           = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
                  xscreensaver.h prefs.h remote.h exec.h \
                  demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
-                 demo-Gtk-conf.h
+                 demo-Gtk-conf.h auth.h mlstring.h types.h
 MEN_1          = xscreensaver.man xscreensaver-demo.man \
                  xscreensaver-command.man \
                  xscreensaver-text.man \
@@ -431,8 +432,8 @@ install-pam:
            $(INSTALL_DATA) $$src $$dir/$$dest ;                        \
          else                                                          \
            src="xscreensaver.pam.$$$$" ;                               \
-           echo "grep '^#%\|^auth' $$src2 > $$src" ;                   \
-                 grep '^#%\|^auth' $$src2 > $$src ;                    \
+           echo "grep '^#%\|^auth\|^@include' $$src2 > $$src" ;        \
+                 grep '^#%\|^auth\|^@include' $$src2 > $$src  ;        \
            echo $(INSTALL_DATA) $$src $$dir/$$dest ;                   \
                 $(INSTALL_DATA) $$src $$dir/$$dest ;                   \
            echo rm -f $$src ;                                          \
@@ -452,7 +453,7 @@ install-pam:
  $$e "  ####################################################################";\
  $$e ""                                                                             ;\
          fi ;                                                          \
-       elif [ -f $$conf ]; then                                        \
+       elif [ -f $$conf -a "x$$dest" != "x" ]; then                    \
          if ( grep $$dest $$conf >/dev/null ); then                    \
           echo "$$conf unchanged: already has an entry for $$dest" ;   \
          else                                                          \
@@ -472,7 +473,9 @@ install-pam:
            echo rm -f $$src ;                                          \
                 rm -f $$src ;                                          \
          fi ;                                                          \
-         if ! ( grep $$dest $$conf >/dev/null ); then                  \
+         if ( grep $$dest $$conf >/dev/null ); then                    \
+           echo ;                                                      \
+         else                                                          \
            e=echo ;                                                    \
  $$e ""                                                                             ;\
  $$e "  ####################################################################";\
@@ -495,7 +498,7 @@ install-gnome:: screensaver-properties.desktop
             echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"           ;\
                  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"           ;\
           fi                                                                ;\
-          name2=gnome-screensaver-properties.desktop                        ;\
+          name2=xscreensaver-properties.desktop                             ;\
           echo $(INSTALL_DATA) screensaver-properties.desktop                \
                  $(install_prefix)$(GTK_APPDIR)/$$name2                     ;\
                $(INSTALL_DATA) screensaver-properties.desktop                \
@@ -521,7 +524,7 @@ install-gnome:: $(LOGO)
 # ../utils/images/screensaver-*.png
 # into /usr/share/xscreensaver/glade/
 install-gnome::
-       @if [ "$(GTK_GLADEDIR)" != "" ]; then                                 \
+       @if [ "$(GTK_DATADIR)" != "" ]; then                                 \
            if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then               \
              echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
                   $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
@@ -538,7 +541,7 @@ install-gnome::
 # xscreensaver-demo.glade2
 # into /usr/share/xscreensaver/glade/
 install-gnome:: xscreensaver-demo.glade2
-       @if [ "$(GTK_GLADEDIR)" != "" ]; then                                 \
+       @if [ "$(GTK_DATADIR)" != "" ]; then                                  \
          if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then                \
            echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"          ;\
                 $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"          ;\
@@ -568,7 +571,7 @@ install-gnome:: xscreensaver-demo.glade2
 # into /usr/share/applications/
 uninstall-gnome::
        @if [ "$(GTK_DATADIR)" != "" ]; then                                  \
-          f=gnome-screensaver-properties.desktop                             ;\
+          f=xscreensaver-properties.desktop                                  ;\
           echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f                      ;\
                rm -f $(install_prefix)$(GTK_APPDIR)/$$f                      ;\
         fi
@@ -585,7 +588,7 @@ uninstall-gnome::
 # ../utils/images/screensaver-*.png
 # into /usr/share/xscreensaver/glade/
 uninstall-gnome::
-       @if [ "$(GTK_GLADEDIR)" != "" ]; then                                 \
+       @if [ "$(GTK_DATADIR)" != "" ]; then                                  \
           for target in $(GTK_ICONS) ; do                                    \
             dest=`echo $$target | sed 's@^.*/@@'`                           ;\
             echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$dest              ;\
@@ -596,7 +599,7 @@ uninstall-gnome::
 # xscreensaver-demo.glade2
 # into /usr/share/xscreensaver/glade/
 uninstall-gnome:: xscreensaver-demo.glade2
-       @if [ "$(GTK_GLADEDIR)" != "" ]; then                                 \
+       @if [ "$(GTK_DATADIR)" != "" ]; then                                  \
          target=xscreensaver-demo.glade2                                    ;\
          echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target               ;\
               rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target               ;\
@@ -689,7 +692,7 @@ tags:
        find $(srcdir) -name '*.[chly]' -print | xargs etags -a
 
 echo_tarfiles:
-       @$(MAKE) XScreenSaver_ad.h XScreenSaver_Xm_ad.h 2>&1 >&- /dev/null
+       @$(MAKE) XScreenSaver_ad.h XScreenSaver_Xm_ad.h 2>&1 >/dev/null
        @echo $(TARFILES)
 
 check_men:
@@ -793,7 +796,7 @@ xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
        -lXt -lX11 $(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS)
 
 demo-Gtk.o: XScreenSaver_ad.h
-demo-Xm.o:  XScreenSaver_ad_Xm.h
+demo-Xm.o:  XScreenSaver_Xm_ad.h
 
 xscreensaver-getimage: $(GETIMG_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm
@@ -803,7 +806,7 @@ pdf2jpeg: $(PDF2JPEG_OBJS)
 
 
 TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \
-        subprocs.o setuid.o splash.o prefs.o \
+        subprocs.o setuid.o splash.o prefs.o mlstring.o exec.o \
        $(SAVER_UTIL_OBJS)
 test-passwd.o: XScreenSaver_ad.h
 
@@ -818,7 +821,7 @@ test-xdpms: test-xdpms.o
        $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
 
 test-xinerama: test-xinerama.o
-       $(CC) $(LDFLAGS) -o $@ test-xinerama.o $(LIBS) $(X_LIBS) $(SAVER_LIBS)\
+       $(CC) $(LDFLAGS) -o $@ test-xinerama.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \
        $(X_PRE_LIBS) $(XINERAMA_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
 
 test-vp: test-vp.o
@@ -835,10 +838,19 @@ test-grab: test-grab.o
 test-apm: test-apm.o
        $(CC) $(LDFLAGS) -o $@ test-apm.o $(SAVER_LIBS) -lapm
 
+test-mlstring.o: mlstring.c
+test-mlstring: test-mlstring.o
+       $(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
+
 TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
 test-fade: test-fade.o $(UTILS_BIN)/fade.o
        $(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
 
+TEST_SCREENS_OBJS = test-screens.o $(DEMO_UTIL_OBJS)
+test-screens.o: screens.c
+test-screens: test-screens.o
+       $(CC) $(LDFLAGS) -o $@ $(TEST_SCREENS_OBJS) $(SAVER_LIBS)
+
 
 xdpyinfo.o: xdpyinfo.c
        $(CC) -c $(INCLUDES) -DHAVE_GLX $(CFLAGS) $(X_CFLAGS) \
@@ -854,80 +866,3 @@ xdpyinfo: xdpyinfo.o
 #
 # DO NOT DELETE: updated by make distdepend
 
-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-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-support.h
-demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.h
-demo-Xm.o: ../config.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
-exec.o: $(srcdir)/exec.h
-lock.o: ../config.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
-remote.o: ../config.h
-remote.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)/exec.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)/prefs.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
-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
-
Archive of old xscreensaver versions (http://www.jwz.org/xscreensaver/)