X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=148883d73d70dc1ec562a9b2d9939f96703fdffe;hb=2a991a811de4c7b22f812682b267b616a809fd9a;hp=ae4f62bf1a1fb40d73beec59ad96cd0957bab068;hpb=c6b273ef7292ba10943694df1656b05203d7b62f;p=xscreensaver

diff --git a/driver/Makefile.in b/driver/Makefile.in
index ae4f62bf..148883d7 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -20,6 +20,7 @@ CC		= @CC@
 CFLAGS		= @CFLAGS@
 LDFLAGS		= @LDFLAGS@
 DEFS		= @DEFS@
+DEFS2		= $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"'
 LIBS		= @LIBS@
 
 DEPEND		= @DEPEND@
@@ -32,13 +33,26 @@ SUID_FLAGS      = -o root -m 4755
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SETUID  = @INSTALL_SETUID@
 INSTALL_DATA	= @INSTALL_DATA@
+INSTALL_DIRS	= @INSTALL_DIRS@
 
 X_CFLAGS	= @X_CFLAGS@
 X_LIBS		= @X_LIBS@
 X_PRE_LIBS	= @X_PRE_LIBS@
 X_EXTRA_LIBS	= @X_EXTRA_LIBS@
 
-XLIBS		= $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
+# Note:
+#
+# X_LIBS would more properly be called X_LDFLAGS (it contains the -L args.)
+# X_PRE_LIBS contains extra libraries you have to link against on some systems,
+#         and that must come before -lX11.  (e.g., -lSM and -lICE.)
+# X_EXTRA_LIBS contains extra libraries needed by X that aren't a part of X.
+#         (e.g., -lsocket, -lnsl, etc.)
+#
+# I think (but am not totally sure) that LIBS is also really "LDFLAGS".
+#
+# SAVER_LIBS is the link line for "xscreensaver", and
+# CMD_LIBS is the link line for "xscreensaver-command".
+
 
 AD_DIR		= @APPDEFAULTS@
 
@@ -63,6 +77,8 @@ KERBEROS_OBJS	= kpasswd.o
 LOCK_SRCS_1	= lock.c
 LOCK_OBJS_1	= lock.o
 
+TEST_SRCS	= test-passwd.c test-uid.c test-xdpms.c
+
 DIALOG_SRCS	= @DIALOG_SRCS@
 DIALOG_OBJS	= @DIALOG_OBJS@
 PASSWD_SRCS	= @PASSWD_SRCS@
@@ -81,18 +97,24 @@ UTIL_OBJS	= $(UTILS_BIN)/fade.o $(UTILS_BIN)/overlay.o \
 		  $(UTILS_BIN)/spline.o \
 		  $(UTILS_BIN)/yarandom.o @XMU_OBJS@
 
-SAVER_SRCS_1	= demo.c stderr.c subprocs.c timers.c windows.c \
-		  xscreensaver.c xset.c
-SAVER_OBJS_1	= demo.o stderr.o subprocs.o timers.o windows.o \
-		  xscreensaver.o xset.o
+SAVER_SRCS_1	= demo.c stderr.c subprocs.c setuid.c timers.c windows.c \
+		  xscreensaver.c splash.c xset.c dotfile.c
+SAVER_OBJS_1	= demo.o stderr.o subprocs.o setuid.o timers.o windows.o \
+		  xscreensaver.o splash.o xset.o dotfile.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	= $(X_LIBS) @SAVER_LIBS@ -lXt $(XLIBS) $(PASSWD_LIBS) $(LIBS)
 
 CMD_SRCS	= xscreensaver-command.c
 CMD_OBJS	= xscreensaver-command.o
-CMD_LIBS	= $(X_LIBS) $(XLIBS) $(LIBS)
+
+SAVER_LIBS	= $(LIBS) $(X_LIBS) @SAVER_LIBS@ \
+		  $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
+		  $(PASSWD_LIBS)
+
+CMD_LIBS	= $(X_LIBS) $(X_PRE_LIBS)      \
+		  -lX11 -lXext $(X_EXTRA_LIBS) \
+		  $(LIBS)
 
 EXES		= xscreensaver xscreensaver-command
 
@@ -105,7 +127,7 @@ VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
 
 TARFILES	= $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) \
 		  $(MOTIF_SRCS) $(ATHENA_SRCS) $(PWENT_SRCS) $(KERBEROS_SRCS) \
-		  $(LOCK_SRCS_1) $(CMD_SRCS) $(HDRS) $(MEN)
+		  $(LOCK_SRCS_1) $(CMD_SRCS) $(HDRS) $(TEST_SRCS) $(MEN)
 
 
 all: $(EXES)
@@ -118,7 +140,8 @@ install-strip:
 		INSTALL_SETUID='$(INSTALL_SETUID) -s' \
 		install
 
-install-program:
+install-program: $(EXES)
+	@if [ ! -d $(bindir) ]; then $(INSTALL_DIRS) $(bindir) ; fi
 	@inst="$(INSTALL_PROGRAM)" ;					\
 	if [ @NEED_SETUID@ = yes ]; then				\
 	   me="`whoami`" ;						\
@@ -142,11 +165,13 @@ install-program:
 	$$inst xscreensaver $(bindir)/xscreensaver
 	$(INSTALL_PROGRAM) xscreensaver-command $(bindir)/xscreensaver-command
 
-install-ad:
+install-ad: XScreenSaver.ad
+	@if [ ! -d $(AD_DIR) ]; then $(INSTALL_DIRS) $(AD_DIR) ; fi
 	$(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver
 
-install-man:
+install-man: $(MEN)
 	@men="$(MEN)" ;							\
+	if [ ! -d $(man1dir) ]; then $(INSTALL_DIRS) $(man1dir) ; fi ;	\
 	for man in $$men; do						\
 	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
 	  echo $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ;	\
@@ -174,14 +199,14 @@ clean:
 	-rm -f *.o a.out core $(EXES) XScreenSaver_ad.h
 
 distclean: clean
-	-rm -f Makefile XScreenSaver.ad *~ "#"*
+	-rm -f Makefile XScreenSaver.ad TAGS *~ "#"*
 
 # Adds all current dependencies to Makefile
 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
@@ -192,7 +217,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'			    \
@@ -273,7 +299,11 @@ $(UTIL_OBJS):
 
 # How we build object files in this directory.
 .c.o:
-	$(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+	$(CC) -c $(INCLUDES) $(DEFS)  $(CFLAGS) $(X_CFLAGS) $<
+
+# subprocs is the only one that takes an extra -D option.
+subprocs.o: subprocs.c
+	$(CC) -c $(INCLUDES) $(DEFS2) $(CFLAGS) $(X_CFLAGS) $<
 
 
 # How we build the default app-defaults file into the program.
@@ -290,9 +320,24 @@ 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 setuid.o demo.o splash.o \
+	$(UTIL_OBJS)
+test-passwd.o: XScreenSaver_ad.h
+
+test-passwd: $(TEST_PASSWD_OBJS) XScreenSaver_ad.h
+	$(CC) $(LDFLAGS) -o $@ $(TEST_PASSWD_OBJS) $(SAVER_LIBS)
+
+test-uid: test-uid.o
+	$(CC) $(LDFLAGS) -o $@ test-uid.o
+
+test-xdpms: test-xdpms.o
+	$(CC) $(LDFLAGS) -o $@ test-xdpms.o $(SAVER_LIBS)
+
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
+# $(srcdir)/DO $(srcdir)/NOT $(srcdir)/DELETE: $(srcdir)/updated $(srcdir)/by $(srcdir)/make $(srcdir)/distdepend
 
 demo.o: ../config.h
 demo.o: $(srcdir)/xscreensaver.h
@@ -304,6 +349,8 @@ stderr.o: $(UTILS_SRC)/visual.h
 subprocs.o: ../config.h
 subprocs.o: $(srcdir)/xscreensaver.h
 subprocs.o: $(UTILS_SRC)/yarandom.h
+setuid.o: ../config.h
+setuid.o: $(srcdir)/xscreensaver.h
 timers.o: ../config.h
 timers.o: $(srcdir)/xscreensaver.h
 windows.o: ../config.h
@@ -317,8 +364,22 @@ xscreensaver.o: $(UTILS_SRC)/yarandom.h
 xscreensaver.o: $(UTILS_SRC)/resources.h
 xscreensaver.o: $(UTILS_SRC)/visual.h
 xscreensaver.o: XScreenSaver_ad.h
+splash.o: ../config.h
+splash.o: $(srcdir)/xscreensaver.h
+splash.o: $(UTILS_SRC)/resources.h
 xset.o: ../config.h
 xset.o: $(srcdir)/xscreensaver.h
+dotfile.o: ../config.h
+dotfile.o: $(srcdir)/xscreensaver.h
+dotfile.o: $(UTILS_SRC)/resources.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