-# 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@
INCLUDES = -I. -I$(srcdir) -I$(UTILS_SRC) -I.. @INCLUDES@
-MOTIF_SRCS = dialogs-Xm.c
-MOTIF_OBJS = dialogs-Xm.o
+MOTIF_SRCS = demo-Xm.c demo-Xm-widgets.c
+MOTIF_OBJS = demo-Xm.o demo-Xm-widgets.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
-
PWENT_SRCS = passwd-pwent.c
PWENT_OBJS = passwd-pwent.o
TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c \
test-apm.c xdpyinfo.c
-MOTIF_LIBS = @MOTIF_LIBS@
+MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@
GTK_LIBS = @GTK_LIBS@
-ATHENA_LIBS = @ATHENA_LIBS@
-ATHENA3D_LIBS = @ATHENA3D_LIBS@
PASSWD_SRCS = @PASSWD_SRCS@
PASSWD_OBJS = @PASSWD_OBJS@
CMD_SRCS = remote.c xscreensaver-command.c
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-Xaw.o $(XMU_OBJS)
+DEMO_SRCS_1 = prefs.c $(XMU_SRCS)
+DEMO_OBJS_1 = prefs.o $(XMU_OBJS)
-DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS) demo.c
+DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS)
DEMO_OBJS = prefs.o remote.o $(DEMO_UTIL_OBJS)
SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) \
HDRS = XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \
demo-Gtk-widgets.h demo-Gtk-stubs.h
-MEN = xscreensaver.man @DEMO_MAN@ \
+MEN = xscreensaver.man xscreensaver-demo.man \
xscreensaver-command.man
ALL_MEN = xscreensaver.man \
- xscreensaver-demo.man xscreensaver-demo-old.man \
- xscreensaver-command.man
+ xscreensaver-demo.man xscreensaver-command.man
EXTRAS = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
xscreensaver.kss xscreensaver-demo.glade .gdbinit
VMSFILES = compile_axp.com compile_decc.com link_axp.com link_decc.com \
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) \
+ $(MOTIF_SRCS) $(GTK_SRCS) $(PWENT_SRCS) \
$(KERBEROS_SRCS) $(PAM_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) \
$(CMD_SRCS) $(HDRS) $(TEST_SRCS) $(ALL_MEN)
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)/'` ; \
- instname=`echo $$instname | sed 's/-old//'` ; \
- echo $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ; \
- $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ; \
+ 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
$(DEPEND) -w 0 -f - \
-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
$(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) -- \
- $(SAVER_SRCS_1) $(MOTIF_SRCS) $(GTK_SRCS) $(ATHENA_SRCS) \
+ $(SAVER_SRCS_1) $(MOTIF_SRCS) $(GTK_SRCS) \
$(PWENT_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) \
$(TEST_SRCS) | \
( \
xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@
cp -p @PREFERRED_DEMO_PROGRAM@ $@
-xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) demo-Xm.o
- $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) demo-Xm.o \
- $(LIBS) $(X_LIBS) \
+xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS)
+ $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \
$(MOTIF_LIBS) $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_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
- $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(ATHENA_OBJS) demo-Xaw.o \
- $(LIBS) $(X_LIBS) \
- $(ATHENA_LIBS) $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
-
-xscreensaver-demo-Xaw3d: $(DEMO_OBJS) $(ATHENA_OBJS) demo-Xaw.o
- $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(ATHENA_OBJS) demo-Xaw.o \
- $(LIBS) $(X_LIBS) \
- $(ATHENA3D_LIBS) $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
-
-demo-Xm.o: demo.c XScreenSaver_ad.h
- $(CC) -o $@ -c -DFORCE_MOTIF \
- $(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
-
-
TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \
stderr.o: $(srcdir)/prefs.h
stderr.o: $(UTILS_SRC)/resources.h
stderr.o: $(UTILS_SRC)/visual.h
-dialogs-Xm.o: ../config.h
-dialogs-Xm.o: $(UTILS_SRC)/visual.h
+demo-Xm.o: ../config.h
+demo-Xm.o: $(UTILS_SRC)/version.h
+demo-Xm.o: $(srcdir)/prefs.h
+demo-Xm.o: $(UTILS_SRC)/resources.h
+demo-Xm.o: $(UTILS_SRC)/visual.h
+demo-Xm.o: $(srcdir)/remote.h
+demo-Xm.o: $(UTILS_SRC)/usleep.h
+demo-Xm.o: XScreenSaver_ad.h
+demo-Xm-widgets.o: ../config.h
demo-Gtk.o: ../config.h
demo-Gtk.o: $(UTILS_SRC)/version.h
demo-Gtk.o: $(srcdir)/prefs.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
lock.o: ../config.h
lock.o: $(srcdir)/xscreensaver.h
prefs.o: ../config.h
prefs.o: $(srcdir)/prefs.h
prefs.o: $(UTILS_SRC)/resources.h
-demo.o: ../config.h
-demo.o: $(UTILS_SRC)/version.h
-demo.o: $(srcdir)/prefs.h
-demo.o: $(UTILS_SRC)/resources.h
-demo.o: $(UTILS_SRC)/visual.h
-demo.o: $(srcdir)/remote.h
-demo.o: $(UTILS_SRC)/usleep.h
-demo.o: XScreenSaver_ad.h
remote.o: ../config.h
remote.o: $(srcdir)/remote.h
xscreensaver-command.o: ../config.h
projects / xscreensaver / blobdiff