-# driver/Makefile.in --- xscreensaver, Copyright (c) 1997 Jamie Zawinski.
+# driver/Makefile.in --- xscreensaver, Copyright (c) 1997-1999 Jamie Zawinski.
# the `../configure' script generates `driver/Makefile' from this file.
@SET_MAKE@
MOTIF_SRCS = dialogs-Xm.c
MOTIF_OBJS = dialogs-Xm.o
-GTK_SRCS = dialogs-Gtk.c
-GTK_OBJS = dialogs-Gtk.o
+GTK_SRCS = demo-Gtk.c demo-Gtk-widgets.c
+GTK_OBJS = demo-Gtk.o demo-Gtk-widgets.o
ATHENA_SRCS = dialogs-Xaw.c
ATHENA_OBJS = dialogs-Xaw.o
LOCK_SRCS_1 = lock.c passwd.c
LOCK_OBJS_1 = lock.o passwd.o
+NOLOCK_SRCS_1 = lock.c
+NOLOCK_OBJS_1 = lock.o
-TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c test-apm.c
+TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c \
+ test-apm.c xdpyinfo.c
MOTIF_LIBS = @MOTIF_LIBS@
GTK_LIBS = @GTK_LIBS@
CMD_OBJS = remote.o xscreensaver-command.o
DEMO_SRCS_1 = prefs.c demo.c $(XMU_SRCS)
-DEMO_OBJS_1 = prefs.o demo-Xm.o demo-Gtk.o demo-Xaw.o $(XMU_OBJS)
+DEMO_OBJS_1 = prefs.o demo-Xm.o demo-Xaw.o $(XMU_OBJS)
DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS) demo.c
DEMO_OBJS = prefs.o remote.o $(DEMO_UTIL_OBJS)
EXES = xscreensaver xscreensaver-command xscreensaver-demo
EXES2 = @ALL_DEMO_PROGRAMS@
-HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h
-MEN = xscreensaver.man xscreensaver-demo.man \
+HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \
+ demo-Gtk-widgets.h demo-Gtk-stubs.h
+MEN = xscreensaver.man @DEMO_MAN@ \
+ xscreensaver-command.man
+ALL_MEN = xscreensaver.man \
+ xscreensaver-demo.man xscreensaver-demo-old.man \
xscreensaver-command.man
EXTRAS = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
- xscreensaver.kss .gdbinit
+ xscreensaver.kss xscreensaver-demo.glade .gdbinit
VMSFILES = compile_axp.com compile_decc.com link_axp.com link_decc.com \
vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt
TARFILES = $(EXTRAS) $(VMSFILES) $(SAVER_SRCS_1) \
$(MOTIF_SRCS) $(GTK_SRCS) $(ATHENA_SRCS) $(PWENT_SRCS) \
$(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \
- $(CMD_SRCS) $(HDRS) $(TEST_SRCS) $(MEN)
+ $(CMD_SRCS) $(HDRS) $(TEST_SRCS) $(ALL_MEN)
default: $(EXES)
install
install-program: $(EXES)
- @if [ ! -d $(bindir) ]; then $(INSTALL_DIRS) $(bindir) ; fi
+ @if [ ! -d $(install_prefix)$(bindir) ]; then \
+ $(INSTALL_DIRS) $(install_prefix)$(bindir) ; \
+ fi
@inst="$(INSTALL_PROGRAM)" ; \
if [ @NEED_SETUID@ = yes ]; then \
me=`PATH="$$PATH:/usr/ucb" whoami` ; \
$$e " means that locking might not work. (Try it and see.)" ;\
$$e " ####################################################################";\
$$e "" ;\
- fi ; \
- fi ; \
- echo $$inst xscreensaver $(bindir)/xscreensaver ; \
- $$inst xscreensaver $(bindir)/xscreensaver
- $(INSTALL_PROGRAM) xscreensaver-command $(bindir)/xscreensaver-command
- $(INSTALL_PROGRAM) xscreensaver-demo $(bindir)/xscreensaver-demo
+ fi ; \
+ fi ; \
+ echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \
+ $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
+ $(INSTALL_PROGRAM) xscreensaver-command \
+ $(install_prefix)$(bindir)/xscreensaver-command
+ $(INSTALL_PROGRAM) xscreensaver-demo \
+ $(install_prefix)$(bindir)/xscreensaver-demo
install-ad: XScreenSaver.ad
- @if [ ! -d $(AD_DIR) ]; then $(INSTALL_DIRS) $(AD_DIR) ; fi
- @-echo $(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver ; \
- if $(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver ; then \
+ @if [ ! -d $(install_prefix)$(AD_DIR) ]; then \
+ $(INSTALL_DIRS) $(install_prefix)$(AD_DIR) ; \
+ fi
+ @-echo $(INSTALL_DATA) XScreenSaver.ad \
+ $(install_prefix)$(AD_DIR)/XScreenSaver ; \
+ if $(INSTALL_DATA) XScreenSaver.ad \
+ $(install_prefix)$(AD_DIR)/XScreenSaver ; then \
true ; \
else \
e=echo ; \
- if [ -f $(AD_DIR)/XScreenSaver ]; then \
+ if [ -f $(install_prefix)$(AD_DIR)/XScreenSaver ]; then \
$$e "" ;\
$$e " ####################################################################";\
- $$e " Warning: unable to install $(AD_DIR)/XScreenSaver" ;\
+ $$e " Warning: unable to install $(install_prefix)$(AD_DIR)/XScreenSaver" ;\
$$e " That file exists, and is unwritable. It is probably from" ;\
$$e " an older version of xscreensaver, and could cause things" ;\
$$e " to malfunction. Please delete it!" ;\
else \
$$e "" ;\
$$e " ####################################################################";\
- $$e " Warning: unable to install $(AD_DIR)/XScreenSaver" ;\
+ $$e " Warning: unable to install $(install_prefix)$(AD_DIR)/XScreenSaver" ;\
$$e " The directory is unwritable. This is probably ok;" ;\
$$e " xscreensaver should work without that file." ;\
$$e " ####################################################################";\
install-man: $(MEN)
@men="$(MEN)" ; \
- if [ ! -d $(man1dir) ]; then $(INSTALL_DIRS) $(man1dir) ; fi ; \
+ if [ ! -d $(install_prefix)$(man1dir) ]; then \
+ $(INSTALL_DIRS) $(install_prefix)$(man1dir) ; \
+ fi ; \
for man in $$men; do \
instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \
- echo $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ; \
- $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ; \
+ instname=`echo $$instname | sed 's/-old//'` ; \
+ echo $(INSTALL_DATA) $(srcdir)/$$man \
+ $(install_prefix)$(man1dir)/$$instname ; \
+ $(INSTALL_DATA) $(srcdir)/$$man \
+ $(install_prefix)$(man1dir)/$$instname ; \
done
uninstall-program:
@for program in $(EXES); do \
- echo rm -f $(bindir)/$$program ; \
- rm -f $(bindir)/$$program ; \
+ echo rm -f $(install_prefix)$(bindir)/$$program ; \
+ rm -f $(install_prefix)$(bindir)/$$program ; \
done
uninstall-ad:
- rm -f $(AD_DIR)/XScreenSaver
+ rm -f $(install_prefix)$(AD_DIR)/XScreenSaver
uninstall-man:
@men="$(MEN)" ; \
for man in $$men; do \
instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \
- echo rm -f $(man1dir)/$$instname ; \
- rm -f $(man1dir)/$$instname ; \
+ echo rm -f $(install_prefix)$(man1dir)/$$instname ; \
+ rm -f $(install_prefix)$(man1dir)/$$instname ; \
done
install-pam:
@src="$(srcdir)/xscreensaver.pam" ; \
dest=`sed -n 's/.*PAM_SERVICE_NAME[ ]*"\([^"]*\)".*$$/\1/p' \
< ../config.h` ; \
- dir="$(PAM_DIR)" ; \
+ dir="$(install_prefix)$(PAM_DIR)" ; \
conf="$(PAM_CONF)" ; \
\
if [ -d $$dir ] ; then \
install-kde:
@src="$(srcdir)/xscreensaver.kss" ; \
if [ "$$KDEDIR" != "" ]; then \
- dir="$$KDEDIR/bin" ; \
+ dir="$(install_prefix)$$KDEDIR/bin" ; \
dest="$$dir/xscreensaver.kss" ; \
echo $(INSTALL_PROGRAM) $$src $$dest ; \
if $(INSTALL_PROGRAM) $$src $$dest ; then \
$$e "" ;\
$$e " ####################################################################";\
$$e " Warning: unable to install $$dest" ;\
- if [ ! -d $$KDEDIR ]; then \
- $$e " $$KDEDIR (\$$KDEDIR) does not exist." ;\
- elif [ ! -d $$KDEDIR/bin ]; then \
- $$e " $$KDEDIR/bin (\$$KDEDIR/bin) does not exist." ;\
+ if [ ! -d $(install_prefix)$$KDEDIR ]; then \
+ $$e " $(install_prefix)$$KDEDIR (\$$KDEDIR) does not exist." ;\
+ elif [ ! -d $(install_prefix)$$KDEDIR/bin ]; then \
+ $$e " $(install_prefix)$$KDEDIR/bin (\$$KDEDIR/bin) does not exist.";\
elif [ -f $$dest ]; then \
$$e " That file exists, and is unwritable." ;\
else \
uninstall-kde:
@if [ "$$KDEDIR" != "" ]; then \
- dest="$$KDEDIR/bin/xscreensaver.kss" ; \
+ dest="$(install_prefix)$$KDEDIR/bin/xscreensaver.kss" ; \
echo rm -f $$dest ; \
rm -f $$dest ; \
fi
$(LIBS) $(X_LIBS) \
$(MOTIF_LIBS) $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
-xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS) demo-Gtk.o
- $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) demo-Gtk.o \
- $(LIBS) $(X_LIBS) \
+xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
+ $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \
$(GTK_LIBS) $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
xscreensaver-demo-Xaw: $(DEMO_OBJS) $(ATHENA_OBJS) demo-Xaw.o
demo-Xm.o: demo.c XScreenSaver_ad.h
$(CC) -o $@ -c -DFORCE_MOTIF \
$(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $(srcdir)/demo.c
-demo-Gtk.o: demo.c XScreenSaver_ad.h
- $(CC) -o $@ -c -DFORCE_GTK \
- $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $(srcdir)/demo.c
demo-Xaw.o: demo.c XScreenSaver_ad.h
$(CC) -o $@ -c -DFORCE_ATHENA \
$(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $(srcdir)/demo.c
$(CC) $(LDFLAGS) -o $@ test-apm.o $(SAVER_LIBS) -lapm
+xdpyinfo.o: xdpyinfo.c
+ $(CC) -c $(INCLUDES) -DHAVE_GLX $(CFLAGS) $(X_CFLAGS) \
+ $(srcdir)/xdpyinfo.c
+
+xdpyinfo: xdpyinfo.o
+ $(CC) $(LDFLAGS) -o $@ xdpyinfo.o \
+ $(LIBS) $(X_LIBS) @GL_LIBS@ \
+ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm
+
##############################################################################
#
stderr.o: $(UTILS_SRC)/visual.h
dialogs-Xm.o: ../config.h
dialogs-Xm.o: $(UTILS_SRC)/visual.h
-dialogs-Gtk.o: ../config.h
-dialogs-Gtk.o: $(UTILS_SRC)/resources.h
+demo-Gtk.o: ../config.h
+demo-Gtk.o: $(UTILS_SRC)/version.h
+demo-Gtk.o: $(srcdir)/prefs.h
+demo-Gtk.o: $(UTILS_SRC)/resources.h
+demo-Gtk.o: $(UTILS_SRC)/visual.h
+demo-Gtk.o: $(srcdir)/remote.h
+demo-Gtk.o: $(UTILS_SRC)/usleep.h
+demo-Gtk.o: $(srcdir)/demo-Gtk-widgets.h
+demo-Gtk.o: XScreenSaver_ad.h
+demo-Gtk-widgets.o: ../config.h
+demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-stubs.h
+demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.h
dialogs-Xaw.o: ../config.h
dialogs-Xaw.o: $(UTILS_SRC)/visual.h
passwd-pwent.o: ../config.h
projects / xscreensaver / blobdiff