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 d9e4d755d1c065abe6f2bc4fb095c73e303a9c18..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
@@
-116,10
+117,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_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-mlstring.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_EXES = test-passwd test-uid test-xdpms test-grab \
test-apm test-fade test-xinerama test-vp \
- test-randr xdpyinfo test-mlstring
+ test-randr xdpyinfo test-mlstring
test-screens
MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
GTK_LIBS = @GTK_LIBS@ $(XMU_LIBS)
MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
GTK_LIBS = @GTK_LIBS@ $(XMU_LIBS)
@@
-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@
@@
-147,9
+149,9
@@
LOGO = $(ICON_SRC)/logo-50.xpm
GTK_ICONS = $(ICON_SRC)/screensaver-*.png
DEMO_UTIL_SRCS = $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \
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 \
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 \
SAVER_UTIL_SRCS = $(UTILS_SRC)/fade.c $(UTILS_SRC)/overlay.c \
$(UTILS_SRC)/logo.c $(UTILS_SRC)/yarandom.c \
@@
-179,24
+181,24
@@
GETIMG_OBJS = $(GETIMG_OBJS_1) \
$(UTILS_BIN)/logo.o $(UTILS_BIN)/minixpm.o prefs.o \
$(XMU_OBJS)
$(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 mlstring.c
-SAVER_OBJS_1 = xscreensaver.o windows.o
timers.o subprocs.o exec
.o \
- xset.o splash.o setuid.o stderr.o mlstring.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_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_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
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
PDF2JPEG_SRCS = pdf2jpeg.m
PDF2JPEG_OBJS = pdf2jpeg.o
@@
-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 ; \
@@
-453,7
+455,7
@@
install-pam:
$$e " ####################################################################";\
$$e "" ;\
fi ; \
$$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 \
if ( grep $$dest $$conf >/dev/null ); then \
echo "$$conf unchanged: already has an entry for $$dest" ; \
else \
@@
-498,7
+500,7
@@
install-gnome:: screensaver-properties.desktop
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
fi ;\
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 \
echo $(INSTALL_DATA) screensaver-properties.desktop \
$(install_prefix)$(GTK_APPDIR)/$$name2 ;\
$(INSTALL_DATA) screensaver-properties.desktop \
@@
-571,7
+573,7
@@
install-gnome:: xscreensaver-demo.glade2
# into /usr/share/applications/
uninstall-gnome::
@if [ "$(GTK_DATADIR)" != "" ]; then \
# 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
echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\
rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\
fi
@@
-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
@@
-846,6
+854,11
@@
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-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) \
xdpyinfo.o: xdpyinfo.c
$(CC) -c $(INCLUDES) -DHAVE_GLX $(CFLAGS) $(X_CFLAGS) \
@@
-872,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
@@
-913,6
+924,11
@@
prefs.o: $(srcdir)/types.h
prefs.o: $(UTILS_SRC)/resources.h
remote.o: ../config.h
remote.o: $(srcdir)/remote.h
prefs.o: $(UTILS_SRC)/resources.h
remote.o: ../config.h
remote.o: $(srcdir)/remote.h
+screens.o: ../config.h
+screens.o: $(srcdir)/prefs.h
+screens.o: $(srcdir)/types.h
+screens.o: $(UTILS_SRC)/visual.h
+screens.o: $(srcdir)/xscreensaver.h
setuid.o: ../config.h
setuid.o: $(srcdir)/prefs.h
setuid.o: $(srcdir)/types.h
setuid.o: ../config.h
setuid.o: $(srcdir)/prefs.h
setuid.o: $(srcdir)/types.h
@@
-954,6
+970,12
@@
test-passwd.o: $(UTILS_SRC)/version.h
test-passwd.o: $(UTILS_SRC)/visual.h
test-passwd.o: $(srcdir)/xscreensaver.h
test-randr.o: ../config.h
test-passwd.o: $(UTILS_SRC)/visual.h
test-passwd.o: $(srcdir)/xscreensaver.h
test-randr.o: ../config.h
+test-screens.o: ../config.h
+test-screens.o: $(srcdir)/prefs.h
+test-screens.o: $(srcdir)/screens.c
+test-screens.o: $(srcdir)/types.h
+test-screens.o: $(UTILS_SRC)/visual.h
+test-screens.o: $(srcdir)/xscreensaver.h
test-uid.o: ../config.h
test-vp.o: ../config.h
test-xdpms.o: ../config.h
test-uid.o: ../config.h
test-vp.o: ../config.h
test-xdpms.o: ../config.h