projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.07.tar.gz
[xscreensaver]
/
driver
/
Makefile.in
diff --git
a/driver/Makefile.in
b/driver/Makefile.in
index 5daf8a26f63ec96c591dceb70bbce64601f2e79c..746dd1a8955af970ce522f04b6eabf2d74e32ef8 100644
(file)
--- a/
driver/Makefile.in
+++ b/
driver/Makefile.in
@@
-14,6
+14,7
@@
install_prefix =
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
+datarootdir = @datarootdir@
datadir = @datadir@
localedir = $(datadir)/locale
mandir = @mandir@
datadir = @datadir@
localedir = $(datadir)/locale
mandir = @mandir@
@@
-115,10
+116,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)
@@
-146,9
+147,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 \
@@
-178,24
+179,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
@@
-431,8
+432,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 ; \
@@
-452,7
+453,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 \
@@
-497,7
+498,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 \
@@
-523,7
+524,7
@@
install-gnome:: $(LOGO)
# ../utils/images/screensaver-*.png
# into /usr/share/xscreensaver/glade/
install-gnome::
# ../utils/images/screensaver-*.png
# into /usr/share/xscreensaver/glade/
install-gnome::
- @if [ "$(GTK_
GLADE
DIR)" != "" ]; then \
+ @if [ "$(GTK_
DATA
DIR)" != "" ]; then \
if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
@@
-540,7
+541,7
@@
install-gnome::
# xscreensaver-demo.glade2
# into /usr/share/xscreensaver/glade/
install-gnome:: xscreensaver-demo.glade2
# xscreensaver-demo.glade2
# into /usr/share/xscreensaver/glade/
install-gnome:: xscreensaver-demo.glade2
- @if [ "$(GTK_
GLADEDIR)" != "" ]; then
\
+ @if [ "$(GTK_
DATADIR)" != "" ]; then
\
if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
@@
-570,7
+571,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
@@
-587,7
+588,7
@@
uninstall-gnome::
# ../utils/images/screensaver-*.png
# into /usr/share/xscreensaver/glade/
uninstall-gnome::
# ../utils/images/screensaver-*.png
# into /usr/share/xscreensaver/glade/
uninstall-gnome::
- @if [ "$(GTK_
GLADEDIR)" != "" ]; then
\
+ @if [ "$(GTK_
DATADIR)" != "" ]; then
\
for target in $(GTK_ICONS) ; do \
dest=`echo $$target | sed 's@^.*/@@'` ;\
echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\
for target in $(GTK_ICONS) ; do \
dest=`echo $$target | sed 's@^.*/@@'` ;\
echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$dest ;\
@@
-598,7
+599,7
@@
uninstall-gnome::
# xscreensaver-demo.glade2
# into /usr/share/xscreensaver/glade/
uninstall-gnome:: xscreensaver-demo.glade2
# xscreensaver-demo.glade2
# into /usr/share/xscreensaver/glade/
uninstall-gnome:: xscreensaver-demo.glade2
- @if [ "$(GTK_
GLADEDIR)" != "" ]; then
\
+ @if [ "$(GTK_
DATADIR)" != "" ]; then
\
target=xscreensaver-demo.glade2 ;\
echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target ;\
rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target ;\
target=xscreensaver-demo.glade2 ;\
echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target ;\
rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target ;\
@@
-691,7
+692,7
@@
tags:
find $(srcdir) -name '*.[chly]' -print | xargs etags -a
echo_tarfiles:
find $(srcdir) -name '*.[chly]' -print | xargs etags -a
echo_tarfiles:
- @$(MAKE) XScreenSaver_ad.h XScreenSaver_Xm_ad.h 2>&1 >
&-
/dev/null
+ @$(MAKE) XScreenSaver_ad.h XScreenSaver_Xm_ad.h 2>&1 >/dev/null
@echo $(TARFILES)
check_men:
@echo $(TARFILES)
check_men:
@@
-795,7
+796,7
@@
xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
-lXt -lX11 $(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS)
demo-Gtk.o: XScreenSaver_ad.h
-lXt -lX11 $(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS)
demo-Gtk.o: XScreenSaver_ad.h
-demo-Xm.o: XScreenSaver_
ad_Xm
.h
+demo-Xm.o: XScreenSaver_
Xm_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
@@
-845,6
+846,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) \
@@
-900,7
+906,11
@@
lock.o: $(srcdir)/types.h
lock.o: $(UTILS_SRC)/resources.h
lock.o: $(srcdir)/xscreensaver.h
mlstring.o: $(srcdir)/mlstring.h
lock.o: $(UTILS_SRC)/resources.h
lock.o: $(srcdir)/xscreensaver.h
mlstring.o: $(srcdir)/mlstring.h
+passwd.o: $(srcdir)/auth.h
passwd.o: ../config.h
passwd.o: ../config.h
+passwd.o: $(srcdir)/prefs.h
+passwd.o: $(srcdir)/types.h
+passwd.o: $(srcdir)/xscreensaver.h
passwd-pwent.o: ../config.h
prefs.o: ../config.h
prefs.o: $(srcdir)/prefs.h
passwd-pwent.o: ../config.h
prefs.o: ../config.h
prefs.o: $(srcdir)/prefs.h
@@
-908,6
+918,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
@@
-949,6
+964,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