http://ftp.x.org/contrib/applications/xscreensaver-2.24.tar.gz

[xscreensaver] / driver / Makefile.in

diff --git a/driver/Makefile.in b/driver/Makefile.in
index 2b2b0e1450880a155c4fb1d611290f3e1bdb4abc..64e19587877e12b5367f5ee96259b39a7850246b 100644 (file)
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -48,8 +48,9 @@ X_EXTRA_LIBS  = @X_EXTRA_LIBS@
 # X_EXTRA_LIBS contains extra libraries needed by X that aren't a part of X.
 #         (e.g., -lsocket, -lnsl, etc.)
 #
-XLIBS          = $(X_LIBS) $(X_PRE_LIBS)      -lX11 -lXext $(X_EXTRA_LIBS)
-XTLIBS         = $(X_LIBS) $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
+# SAVER_LIBS is the link line for "xscreensaver", and
+# CMD_LIBS is the link line for "xscreensaver-command".
+
 
 AD_DIR         = @APPDEFAULTS@
 
@@ -99,11 +100,17 @@ SAVER_OBJS_1       = demo.o stderr.o subprocs.o timers.o windows.o \
 
 SAVER_SRCS     = $(SAVER_SRCS_1) $(DIALOG_SRCS) $(LOCK_SRCS) $(UTIL_SRCS)
 SAVER_OBJS     = $(SAVER_OBJS_1) $(DIALOG_OBJS) $(LOCK_OBJS) $(UTIL_OBJS)
-SAVER_LIBS     = @SAVER_LIBS@ -lXt $(XTLIBS) $(PASSWD_LIBS) $(LIBS)
 
 CMD_SRCS       = xscreensaver-command.c
 CMD_OBJS       = xscreensaver-command.o
-CMD_LIBS       = $(XLIBS) $(LIBS)
+
+SAVER_LIBS     = $(X_LIBS) $(X_PRE_LIBS) @SAVER_LIBS@ -lXt   \
+                 -lX11 -lXext $(X_EXTRA_LIBS) $(PASSWD_LIBS) \
+                 $(LIBS)
+
+CMD_LIBS       = $(X_LIBS) $(X_PRE_LIBS)      \
+                 -lX11 -lXext $(X_EXTRA_LIBS) \
+                 $(LIBS)
 
 EXES           = xscreensaver xscreensaver-command
 
@@ -195,7 +202,7 @@ depend: XScreenSaver_ad.h
        $(DEPEND) -s '# DO NOT DELETE: updated by make depend'              \
        $(DEPEND_FLAGS) --                                                  \
        $(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --      \
-       $(SAVER_SRCS_1) $(CMD_SRCS)
+       $(SAVER_SRCS) $(CMD_SRCS)
 
 # Adds some dependencies to Makefile.in -- not totally accurate, but pretty
 # close.  This excludes dependencies on files in /usr/include, etc.  It tries
@@ -206,7 +213,8 @@ distdepend: update_ad_version update_man_version XScreenSaver_ad.h
        $(DEPEND) -w 0 -f -                                                 \
        -s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
        $(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --      \
-       $(SAVER_SRCS_1) $(CMD_SRCS) |                                       \
+       $(SAVER_SRCS_1) $(MOTIF_SRCS) $(ATHENA_SRCS) $(PWENT_SRCS)          \
+       $(LOCK_SRCS_1) $(CMD_SRCS) |                                        \
        (                                                                   \
          awk '/^# .*Makefile.in ---/,/^# DO .*distdepend/' < Makefile.in ; \
          sed -e 's@ \./@ @g;s@ /[^ ]*@@g;/^.*:$$/d'                        \
@@ -308,6 +316,13 @@ xscreensaver-command: $(CMD_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS)
 
 
+TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PWENT_OBJS) $(DIALOG_OBJS) \
+        subprocs.o demo.o \
+       $(UTIL_OBJS)
+
+test-passwd: $(TEST_PASSWD_OBJS)
+       $(CC) $(LDFLAGS) -o $@ $(TEST_PASSWD_OBJS) $(SAVER_LIBS)
+
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
@@ -337,6 +352,14 @@ xscreensaver.o: $(UTILS_SRC)/visual.h
 xscreensaver.o: XScreenSaver_ad.h
 xset.o: ../config.h
 xset.o: $(srcdir)/xscreensaver.h
+dialogs-Xm.o: ../config.h
+dialogs-Xm.o: $(UTILS_SRC)/visual.h
+dialogs-Xaw.o: ../config.h
+dialogs-Xaw.o: $(UTILS_SRC)/visual.h
+passwd.o: ../config.h
+lock.o: ../config.h
+lock.o: $(srcdir)/xscreensaver.h
+lock.o: $(UTILS_SRC)/resources.h
 xscreensaver-command.o: ../config.h
 xscreensaver-command.o: $(UTILS_SRC)/version.h