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.24.tar.gz
[xscreensaver]
/
driver
/
Makefile.in
diff --git
a/driver/Makefile.in
b/driver/Makefile.in
index b97be451e14f92df8930b7d671bd29066993bec4..af077ca935b8e53891451325b13af824868895e6 100644
(file)
--- a/
driver/Makefile.in
+++ b/
driver/Makefile.in
@@
-128,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@
@@
-238,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
@@
-413,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)" ; \
@@
-672,11
+673,13
@@
update_ad_version::
files="XScreenSaver.ad.in ../hacks/config/README ../OSX/bindist.rtf" ; \
U=$(UTILS_SRC)/version.h ; \
V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ; \
files="XScreenSaver.ad.in ../hacks/config/README ../OSX/bindist.rtf" ; \
U=$(UTILS_SRC)/version.h ; \
V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ; \
+ Y=`date '+%Y'` ; \
D=`date '+%d-%b-%Y'` ; \
for S in $$files ; do \
T=/tmp/xs.$$$$ ; \
sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*[ab]*[0-9]*\(.*\)/\1$$V\2/" \
-e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/" \
D=`date '+%d-%b-%Y'` ; \
for S in $$files ; do \
T=/tmp/xs.$$$$ ; \
sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*[ab]*[0-9]*\(.*\)/\1$$V\2/" \
-e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/" \
+ -e "s/\( [0-9][0-9][0-9][0-9]-\)[0-9][0-9][0-9][0-9] /\1$$Y /" \
< $$S > $$T ; \
if cmp -s $$S $$T ; then \
true ; \
< $$S > $$T ; \
if cmp -s $$S $$T ; then \
true ; \
@@
-729,30
+732,34
@@
$(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c
$(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c
$(SAVER_UTIL_OBJS):
$(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c
$(SAVER_UTIL_OBJS):
- cd $(UTILS_BIN) ; \
- $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ $(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
# How we build object files in this directory.
.c.o:
# How we build object files in this directory.
.c.o:
- $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+ $(CC) -c $(INCLUDES) $(DEFS) $(C
PPFLAGS) $(C
FLAGS) $(X_CFLAGS) $<
.m.o:
.m.o:
- $(OBJCC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+ $(OBJCC) -c $(INCLUDES) $(DEFS) $(C
PPFLAGS) $(C
FLAGS) $(X_CFLAGS) $<
# subprocs takes an extra -D option.
subprocs.o: subprocs.c
# subprocs takes an extra -D option.
subprocs.o: subprocs.c
- $(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CFLAGS) $(X_CFLAGS) \
+ $(CC) -c $(INCLUDES) $(SUBP_DEFS) $(C
PPFLAGS) $(C
FLAGS) $(X_CFLAGS) \
$(srcdir)/subprocs.c
$(srcdir)/subprocs.c
+# xscreensaver takes an extra -D option.
+xscreensaver.o: xscreensaver.c
+ $(CC) -c $(INCLUDES) $(DEFS) $(INTL_DEFS) $(CPPFLAGS) $(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) \
- $(GTK_DEFS) $(INTL_DEFS) $(CFLAGS) $(X_CFLAGS) \
+ $(GTK_DEFS) $(INTL_DEFS) $(C
PPFLAGS) $(C
FLAGS) $(X_CFLAGS) \
$(srcdir)/demo-Gtk.c
# demo-Gtk-conf takes an extra -D option.
demo-Gtk-conf.o: demo-Gtk-conf.c
$(srcdir)/demo-Gtk.c
# demo-Gtk-conf takes an extra -D option.
demo-Gtk-conf.o: demo-Gtk-conf.c
- $(CC) -c $(INCLUDES) $(CONF_DEFS) $(GTK_DEFS) $(CFLAGS) $(X_CFLAGS) \
+ $(CC) -c $(INCLUDES) $(CONF_DEFS) $(GTK_DEFS) $(C
PPFLAGS) $(C
FLAGS) $(X_CFLAGS) \
$(srcdir)/demo-Gtk-conf.c
$(srcdir)/demo-Gtk-conf.c
@@
-855,7
+862,7
@@
test-screens: test-screens.o
xdpyinfo.o: xdpyinfo.c
xdpyinfo.o: xdpyinfo.c
- $(CC) -c $(INCLUDES) -DHAVE_GLX $(CFLAGS) $(X_CFLAGS) \
+ $(CC) -c $(INCLUDES) -DHAVE_GLX $(C
PPFLAGS) $(C
FLAGS) $(X_CFLAGS) \
$(srcdir)/xdpyinfo.c
xdpyinfo: xdpyinfo.o
$(srcdir)/xdpyinfo.c
xdpyinfo: xdpyinfo.o
@@
-916,6
+923,7
@@
prefs.o: ../config.h
prefs.o: $(srcdir)/prefs.h
prefs.o: $(srcdir)/types.h
prefs.o: $(UTILS_SRC)/resources.h
prefs.o: $(srcdir)/prefs.h
prefs.o: $(srcdir)/types.h
prefs.o: $(UTILS_SRC)/resources.h
+prefs.o: $(UTILS_SRC)/version.h
remote.o: ../config.h
remote.o: $(srcdir)/remote.h
screens.o: ../config.h
remote.o: ../config.h
remote.o: $(srcdir)/remote.h
screens.o: ../config.h