projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.17.tar.gz
[xscreensaver]
/
driver
/
Makefile.in
diff --git
a/driver/Makefile.in
b/driver/Makefile.in
index 13504008e72025063df16ba8490c93f028d31ac8..ccf98ea25157f4c1b8855665ce8bd22a24f42330 100644
(file)
--- a/
driver/Makefile.in
+++ b/
driver/Makefile.in
@@
-1,4
+1,4
@@
-# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-20
05
Jamie Zawinski.
+# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-20
10
Jamie Zawinski.
# the `../configure' script generates `driver/Makefile' from this file.
@SET_MAKE@
# the `../configure' script generates `driver/Makefile' from this file.
@SET_MAKE@
@@
-87,7
+87,8
@@
PAM_CONF = /etc/pam.conf
UTILS_SRC = $(srcdir)/../utils
UTILS_BIN = ../utils
UTILS_SRC = $(srcdir)/../utils
UTILS_BIN = ../utils
-INCLUDES = -I. -I$(srcdir) -I$(UTILS_SRC) -I.. @INCLUDES@
+INCLUDES_1 = -I. -I$(srcdir) -I$(UTILS_SRC) -I..
+INCLUDES = $(INCLUDES_1) @INCLUDES@
MOTIF_SRCS = demo-Xm.c demo-Xm-widgets.c
MOTIF_OBJS = demo-Xm.o demo-Xm-widgets.o
MOTIF_SRCS = demo-Xm.c demo-Xm-widgets.c
MOTIF_OBJS = demo-Xm.o demo-Xm-widgets.o
@@
-127,6
+128,7
@@
XML_LIBS = @XML_LIBS@
XDPMS_LIBS = @XDPMS_LIBS@
XINERAMA_LIBS = @XINERAMA_LIBS@
XDPMS_LIBS = @XDPMS_LIBS@
XINERAMA_LIBS = @XINERAMA_LIBS@
+XINPUT_LIBS = @XINPUT_LIBS@
PASSWD_SRCS = @PASSWD_SRCS@
PASSWD_OBJS = @PASSWD_OBJS@
PASSWD_SRCS = @PASSWD_SRCS@
PASSWD_OBJS = @PASSWD_OBJS@
@@
-237,7
+239,7
@@
MEN_OSX = xscreensaver-getimage-desktop.man pdf2jpeg.man
MEN = $(MEN_1) @MEN_OSX@
EXTRAS = README Makefile.in \
MEN = $(MEN_1) @MEN_OSX@
EXTRAS = README Makefile.in \
- XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
+ XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam
.in
\
xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
screensaver-properties.desktop.in \
.gdbinit
xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
screensaver-properties.desktop.in \
.gdbinit
@@
-412,8
+414,8
@@
uninstall-man:
rm -f $(install_prefix)$(manNdir)/$$instname* ; \
done
rm -f $(install_prefix)$(manNdir)/$$instname* ; \
done
-install-pam:
- @src="
$(srcdir)/xscreensaver.pam" ;
\
+install-pam:
xscreensaver.pam
+ @src="
xscreensaver.pam" ;
\
dest=`sed -n 's/.*PAM_SERVICE_NAME[ ]*"\([^"]*\)".*$$/\1/p' \
< ../config.h` ; \
dir="$(install_prefix)$(PAM_DIR)" ; \
dest=`sed -n 's/.*PAM_SERVICE_NAME[ ]*"\([^"]*\)".*$$/\1/p' \
< ../config.h` ; \
dir="$(install_prefix)$(PAM_DIR)" ; \
@@
-432,8
+434,8
@@
install-pam:
$(INSTALL_DATA) $$src $$dir/$$dest ; \
else \
src="xscreensaver.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 ; \
echo $(INSTALL_DATA) $$src $$dir/$$dest ; \
$(INSTALL_DATA) $$src $$dir/$$dest ; \
echo rm -f $$src ; \
@@
-632,7
+634,7
@@
distclean: clean
depend: XScreenSaver_ad.h XScreenSaver_Xm_ad.h
$(DEPEND) -s '# DO NOT DELETE: updated by make depend' \
$(DEPEND_FLAGS) -- \
depend: XScreenSaver_ad.h XScreenSaver_Xm_ad.h
$(DEPEND) -s '# DO NOT DELETE: updated by make depend' \
$(DEPEND_FLAGS) -- \
- $(INCLUDES
) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --
\
+ $(INCLUDES
_1) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --
\
$(SAVER_SRCS) $(CMD_SRCS) $(GETIMG_SRCS_1)
# Adds some dependencies to Makefile.in -- not totally accurate, but pretty
$(SAVER_SRCS) $(CMD_SRCS) $(GETIMG_SRCS_1)
# Adds some dependencies to Makefile.in -- not totally accurate, but pretty
@@
-643,8
+645,7
@@
distdepend: check_men update_ad_version XScreenSaver_ad.h XScreenSaver_Xm_ad.h
@echo updating dependencies in `pwd`/Makefile.in... ; \
$(DEPEND) -w 0 -f - \
-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
@echo updating dependencies in `pwd`/Makefile.in... ; \
$(DEPEND) -w 0 -f - \
-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
- $(INCLUDES) -I$(ICON_SRC) $(DEFS) $(DEPEND_DEFINES) \
- $(CFLAGS) $(X_CFLAGS) -- \
+ $(INCLUDES_1) $(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) 2>/dev/null | \
$(SAVER_SRCS_1) $(MOTIF_SRCS) $(GTK_SRCS) $(GETIMG_SRCS_1) \
$(PWENT_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) \
$(TEST_SRCS) 2>/dev/null | \
@@
-744,6
+745,11
@@
subprocs.o: subprocs.c
$(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CFLAGS) $(X_CFLAGS) \
$(srcdir)/subprocs.c
$(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CFLAGS) $(X_CFLAGS) \
$(srcdir)/subprocs.c
+# xscreensaver takes an extra -D option.
+xscreensaver.o: xscreensaver.c
+ $(CC) -c $(INCLUDES) $(DEFS) $(INTL_DEFS) $(CFLAGS) $(X_CFLAGS) \
+ $(srcdir)/xscreensaver.c
+
# 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) \
# 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) \
@@
-797,6
+803,8
@@
xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
demo-Gtk.o: XScreenSaver_ad.h
demo-Xm.o: XScreenSaver_Xm_ad.h
demo-Gtk.o: XScreenSaver_ad.h
demo-Xm.o: XScreenSaver_Xm_ad.h
+xscreensaver.o: XScreenSaver_ad.h
+xscreensaver-getimage.o: XScreenSaver_ad.h
xscreensaver-getimage: $(GETIMG_OBJS)
$(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm
xscreensaver-getimage: $(GETIMG_OBJS)
$(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm
@@
-877,8
+885,6
@@
demo-Gtk.o: $(srcdir)/demo-Gtk-widgets.h
demo-Gtk.o: $(srcdir)/prefs.h
demo-Gtk.o: $(srcdir)/remote.h
demo-Gtk.o: $(srcdir)/types.h
demo-Gtk.o: $(srcdir)/prefs.h
demo-Gtk.o: $(srcdir)/remote.h
demo-Gtk.o: $(srcdir)/types.h
-demo-Gtk.o: $(UTILS_SRC)/images/logo-180.xpm
-demo-Gtk.o: $(UTILS_SRC)/images/logo-50.xpm
demo-Gtk.o: $(UTILS_SRC)/resources.h
demo-Gtk.o: $(UTILS_SRC)/usleep.h
demo-Gtk.o: $(UTILS_SRC)/version.h
demo-Gtk.o: $(UTILS_SRC)/resources.h
demo-Gtk.o: $(UTILS_SRC)/usleep.h
demo-Gtk.o: $(UTILS_SRC)/version.h