GNOME_PANELDIR2 = $(GNOME_DATADIR)/applications
GNOME_PANELDIR = @GNOME_PANELDIR@
GLADE_DATADIR = @GLADE_DATADIR@
+GNOME_ICONDIR = $(GNOME_DATADIR)/pixmaps
GNOME_BINDIR = $(bindir)
HACK_CONF_DIR = @HACK_CONF_DIR@
LIBS = @LIBS@
INTL_LIBS = @INTLLIBS@
+JPEG_LIBS = @JPEG_LIBS@
PERL = @PERL@
DEPEND = @DEPEND@
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 xdpyinfo.c
+ test-apm.c test-fade.c test-xinerama.c xdpyinfo.c
TEST_EXES = test-passwd test-uid test-xdpms test-grab \
- test-apm test-fade xdpyinfo
+ test-apm test-fade test-xinerama xdpyinfo
MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
GTK_LIBS = @GTK_LIBS@ $(XMU_LIBS)
ICON_SRC = $(UTILS_SRC)/images
LOGO = $(ICON_SRC)/logo-50.xpm
-GTK_ICONS = $(ICON_SRC)/screensaver-*.xpm
+GTK_ICONS = $(ICON_SRC)/screensaver-*.png
DEMO_UTIL_SRCS = $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \
$(UTILS_SRC)/visual.c
CMD_LIBS = $(LIBS) $(X_LIBS) \
$(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
-GETIMG_LIBS = $(LIBS) $(X_LIBS) $(XPM_LIBS) \
+GETIMG_LIBS = $(LIBS) $(X_LIBS) $(XPM_LIBS) $(JPEG_LIBS) \
$(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS)
EXES = xscreensaver xscreensaver-command xscreensaver-demo \
perl="${PERL}" ; \
rm -f $$tmp ; \
for program in $(SCRIPTS); do \
- echo "adjusting location of perl in $$program..." ; \
sed "s@^\(#!\)\(/[^ ]*/perl[^ ]*\)\(.*\)\$$@\1$$perl\3@" \
< $(srcdir)/$$program > $$tmp ; \
if cmp -s $(srcdir)/$$program $$tmp ; then \
+ echo "$$program unchanged" ; \
true ; \
else \
+ echo "$$program: setting interpreter to $$perl" ; \
cat $$tmp > ./$$program ; \
fi ; \
done ; \
fi
# xscreensaver.xpm
+# into /usr/share/pixmaps/
install-gnome:: $(LOGO)
- @if [ "$(GLADE_DATADIR)" != "" ]; then \
- if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then \
- echo $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)" ;\
- $(INSTALL_DIRS) "$(install_prefix)$(GLADE_DATADIR)" ;\
+ @if [ "$(GNOME_DATADIR)" != "" ]; then \
+ if [ ! -d "$(install_prefix)$(GNOME_ICONDIR)" ]; then \
+ echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_ICONDIR)" ;\
+ $(INSTALL_DIRS) "$(install_prefix)$(GNOME_ICONDIR)" ;\
fi ;\
target=xscreensaver.xpm ;\
echo $(INSTALL_DATA) $(LOGO) \
- $(install_prefix)$(GLADE_DATADIR)/$$target ;\
+ $(install_prefix)$(GNOME_ICONDIR)/$$target ;\
$(INSTALL_DATA) $(LOGO) \
- $(install_prefix)$(GLADE_DATADIR)/$$target ;\
+ $(install_prefix)$(GNOME_ICONDIR)/$$target ;\
fi
-# ../utils/images/screensaver-*.xpm
+# ../utils/images/screensaver-*.png
+# into /usr/share/xscreensaver/
+#
+# Should these really go in GLADE_DATADIR (/usr/share/xscreensaver/)
+# or should they instead go in GNOME_ICONDIR (/usr/share/pixmaps/)?
+# Does it matter?
+#
install-gnome::
@if [ "$(GLADE_DATADIR)" != "" ]; then \
if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then \
fi
# xscreensaver-demo.glade2
+# into /usr/share/xscreensaver/
install-gnome:: xscreensaver-demo.glade2
@if [ "$(GLADE_DATADIR)" != "" ]; then \
if [ ! -d "$(install_prefix)$(GLADE_DATADIR)" ]; then \
# screensaver-properties.desktop
+# into /usr/share/gnome/apps/Settings/Desktop/
uninstall-gnome::
@if [ "$(GNOME_DATADIR)" != "" ]; then \
f=screensaver-properties.desktop ;\
fi
# screensaver-properties-capplet
+# into /usr/X11R6/bin/
uninstall-gnome::
@if [ "$(GNOME_DATADIR)" != "" ]; then \
program=screensaver-properties-capplet ;\
fi
# xscreensaver.xpm
+# into /usr/share/pixmaps/
uninstall-gnome::
- @if [ "$(GLADE_DATADIR)" != "" ]; then \
+ @if [ "$(GNOME_ICONDIR)" != "" ]; then \
target=xscreensaver.xpm ;\
- echo rm -f $(install_prefix)$(GLADE_DATADIR)/$$target ;\
- rm -f $(install_prefix)$(GLADE_DATADIR)/$$target ;\
+ echo rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target ;\
+ rm -f $(install_prefix)$(GNOME_ICONDIR)/$$target ;\
fi
-# xscreensaver.xpm
+# ../utils/images/screensaver-*.png
+# into /usr/share/xscreensaver/
uninstall-gnome::
@if [ "$(GLADE_DATADIR)" != "" ]; then \
for target in $(GTK_ICONS) ; do \
done ;\
fi
+# xscreensaver.kss
install-kde:
@src="xscreensaver.kss" ; \
if [ "$$KDEDIR" != "" ]; then \
xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@
- cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@
-# $(INSTALL_PROGRAM) @PREFERRED_DEMO_PROGRAM@ $@
+ @if [ "@PREFERRED_DEMO_PROGRAM@" = "" ]; then \
+ echo "WARNING: neither GTK nor Motif are available," \
+ "therefore no xscreensaver-demo!" ; \
+ rm -f $@@EXEEXT@ ; \
+ else \
+ echo cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@ ; \
+ cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@ ; \
+ fi
xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS)
$(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \
$(CC) $(LDFLAGS) -o $@ test-xdpms.o $(LIBS) $(X_LIBS) $(XDPMS_LIBS) \
$(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
+test-xinerama: test-xinerama.o
+ $(CC) $(LDFLAGS) -o $@ test-xinerama.o $(LIBS) $(X_LIBS) $(SAVER_LIBS)\
+ $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS)
+
test-grab: test-grab.o
$(CC) $(LDFLAGS) -o $@ test-grab.o $(SAVER_LIBS)
demo-Gtk-conf.o: ../config.h
demo-Gtk-conf.o: $(srcdir)/demo-Gtk-conf.h
-demo-Gtk.o: XScreenSaver_ad.h
demo-Gtk.o: ../config.h
demo-Gtk.o: $(srcdir)/demo-Gtk-conf.h
demo-Gtk.o: $(srcdir)/demo-Gtk-support.h
demo-Gtk.o: $(srcdir)/demo-Gtk-widgets.h
demo-Gtk.o: $(srcdir)/prefs.h
demo-Gtk.o: $(srcdir)/remote.h
+demo-Gtk.o: XScreenSaver_ad.h
demo-Gtk-support.o: ../config.h
demo-Gtk-support.o: $(srcdir)/demo-Gtk-support.h
demo-Gtk-widgets.o: ../config.h
demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-stubs.h
demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-support.h
demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.h
-demo-Xm.o: XScreenSaver_ad.h
demo-Xm.o: ../config.h
-demo-Xm.o: $(srcdir)/prefs.h
-demo-Xm.o: $(srcdir)/remote.h
demo-Xm-widgets.o: ../config.h
dpms.o: ../config.h
dpms.o: $(srcdir)/prefs.h
test-fade.o: $(srcdir)/prefs.h
test-fade.o: $(srcdir)/xscreensaver.h
test-grab.o: ../config.h
-test-passwd.o: XScreenSaver_ad.h
test-passwd.o: ../config.h
test-passwd.o: $(srcdir)/prefs.h
+test-passwd.o: XScreenSaver_ad.h
test-passwd.o: $(srcdir)/xscreensaver.h
test-uid.o: ../config.h
test-xdpms.o: ../config.h
+test-xinerama.o: ../config.h
timers.o: ../config.h
timers.o: $(srcdir)/prefs.h
timers.o: $(srcdir)/xscreensaver.h
xscreensaver-getimage.o: ../config.h
xscreensaver-getimage.o: XScreenSaver_ad.h
xscreensaver-getimage.o: $(srcdir)/prefs.h
-xscreensaver.o: XScreenSaver_ad.h
xscreensaver.o: ../config.h
xscreensaver.o: $(srcdir)/prefs.h
+xscreensaver.o: XScreenSaver_ad.h
xscreensaver.o: $(srcdir)/xscreensaver.h
xset.o: ../config.h
xset.o: $(srcdir)/prefs.h