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
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)
if [ ! -d $(man1dir) ]; then $(INSTALL_DIRS) $(man1dir) ; fi ; \
for man in $$men; do \
instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \
+ instname=`echo $$instname | sed 's/-old//'` ; \
echo $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ; \
$(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ; \
done
$(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