X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FMakefile.in;h=d9e4d755d1c065abe6f2bc4fb095c73e303a9c18;hp=aa02e51b48bf70ced9a4fb0dca200c8fbf0a105a;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=3f438031d610c7e15fd33876a879b97e290e05fb diff --git a/driver/Makefile.in b/driver/Makefile.in index aa02e51b..d9e4d755 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -14,6 +14,7 @@ install_prefix = prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ +datarootdir = @datarootdir@ 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-randr.c xdpyinfo.c + test-randr.c xdpyinfo.c test-mlstring.c TEST_EXES = test-passwd test-uid test-xdpms test-grab \ test-apm test-fade test-xinerama test-vp \ - test-randr xdpyinfo + test-randr xdpyinfo test-mlstring MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS) GTK_LIBS = @GTK_LIBS@ $(XMU_LIBS) @@ -152,32 +153,36 @@ DEMO_UTIL_OBJS = $(UTILS_BIN)/resources.o $(UTILS_BIN)/usleep.o \ SAVER_UTIL_SRCS = $(UTILS_SRC)/fade.c $(UTILS_SRC)/overlay.c \ $(UTILS_SRC)/logo.c $(UTILS_SRC)/yarandom.c \ + $(UTILS_SRC)/minixpm.c \ $(DEMO_UTIL_SRCS) SAVER_UTIL_OBJS = $(UTILS_BIN)/fade.o $(UTILS_BIN)/overlay.o \ $(UTILS_BIN)/logo.o $(UTILS_BIN)/yarandom.o \ + $(UTILS_BIN)/minixpm.o \ $(DEMO_UTIL_OBJS) GETIMG_SRCS_1 = xscreensaver-getimage.c GETIMG_OBJS_1 = xscreensaver-getimage.o GETIMG_SRCS = $(GETIMG_SRCS_1) \ - $(UTILS_SRC)/colorbars.o $(UTILS_SRC)/resources.o \ - $(UTILS_SRC)/yarandom.o $(UTILS_SRC)/visual.o \ - $(UTILS_SRC)/usleep.o $(UTILS_SRC)/hsv.o \ - $(UTILS_SRC)/colors.o $(UTILS_SRC)/grabscreen.o \ - $(UTILS_SRC)/logo.o prefs.o $(XMU_SRCS) + $(UTILS_BIN)/colorbars.o $(UTILS_BIN)/resources.o \ + $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/visual.o \ + $(UTILS_BIN)/usleep.o $(UTILS_BIN)/hsv.o \ + $(UTILS_BIN)/colors.o $(UTILS_BIN)/grabscreen.o \ + $(UTILS_BIN)/logo.o $(UTILS_BIN)/minixpm.o prefs.o \ + $(XMU_SRCS) GETIMG_OBJS = $(GETIMG_OBJS_1) \ $(UTILS_BIN)/colorbars.o $(UTILS_BIN)/resources.o \ $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/visual.o \ $(UTILS_BIN)/usleep.o $(UTILS_BIN)/hsv.o \ $(UTILS_BIN)/colors.o $(UTILS_BIN)/grabscreen.o \ - $(UTILS_BIN)/logo.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 + 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 + xset.o splash.o setuid.o stderr.o mlstring.o SAVER_SRCS = $(SAVER_SRCS_1) prefs.c dpms.c $(LOCK_SRCS) \ $(SAVER_UTIL_SRCS) $(GL_SRCS) $(XMU_SRCS) @@ -219,9 +224,9 @@ SCRIPTS_OSX = xscreensaver-getimage-desktop SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ - xscreensaver.h prefs.h remote.h \ + xscreensaver.h prefs.h remote.h exec.h \ demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \ - demo-Gtk-conf.h + demo-Gtk-conf.h auth.h mlstring.h types.h MEN_1 = xscreensaver.man xscreensaver-demo.man \ xscreensaver-command.man \ xscreensaver-text.man \ @@ -366,7 +371,7 @@ munge-scripts: $(SCRIPTS) install-man: $(MEN) @men="$(MEN)" ; \ U=$(UTILS_SRC)/version.h ; \ - V=`sed -n 's/.*\([0-9]\.[^)]*)\).*/\1/p' < $$U` ; \ + V=`sed -n 's/.*xscreensaver \([0-9]\.[^)]*)\).*/\1/p' < $$U` ; \ T=/tmp/xs$$$$.$(mansuffix) ; \ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ @@ -377,8 +382,11 @@ install-man: $(MEN) \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ + manbase=`echo $$man | sed 's/\.man$$//'` ; \ + TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ; \ sed -e "s/^\.TH.*/$$TH/" \ -e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/' \ + -e 's@(MANSUFFIX)@($(mansuffix))@g' \ < $(srcdir)/$$man > $$T ; \ echo $(INSTALL_DATA) $(srcdir)/$$man \ $(install_prefix)$(manNdir)/$$instname ; \ @@ -465,7 +473,9 @@ install-pam: echo rm -f $$src ; \ rm -f $$src ; \ fi ; \ - if ! ( grep $$dest $$conf >/dev/null ); then \ + if ( grep $$dest $$conf >/dev/null ); then \ + echo ; \ + else \ e=echo ; \ $$e "" ;\ $$e " ####################################################################";\ @@ -514,7 +524,7 @@ install-gnome:: $(LOGO) # ../utils/images/screensaver-*.png # into /usr/share/xscreensaver/glade/ install-gnome:: - @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)" ;\ @@ -531,7 +541,7 @@ install-gnome:: # 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)" ;\ @@ -578,7 +588,7 @@ 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 ;\ @@ -589,7 +599,7 @@ uninstall-gnome:: # 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 ;\ @@ -615,7 +625,7 @@ clean: XScreenSaver_ad.h XScreenSaver_Xm_ad.h distclean: clean - -rm -f Makefile XScreenSaver.ad XScreenSaver-Xm.ad \ + -rm -f Makefile XScreenSaver.ad \ TAGS *~ "#"* screensaver-properties.desktop # Adds all current dependencies to Makefile @@ -658,30 +668,31 @@ distdepend: check_men update_ad_version XScreenSaver_ad.h XScreenSaver_Xm_ad.h # have a version skew between the app-defaults file and the executable. # Also update hacks/config/README in the same way. update_ad_version:: - @files="XScreenSaver.ad.in ../hacks/config/README" ; \ - U=$(UTILS_SRC)/version.h ; \ - V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ; \ - D=`date '+%d-%b-%Y'` ; \ - for S in $$files ; do \ - T=/tmp/xs.$$$$ ; \ - sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*\(.*\)/\1$$V\2/" \ - -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/" \ - < $$S > $$T ; \ - if cmp -s $$S $$T ; then \ - true ; \ - else \ - cat $$T > $$S ; \ - echo "updated $$S to $$V $$D" ; \ - fi ; \ - done ; \ - rm $$T + @ \ + files="XScreenSaver.ad.in ../hacks/config/README ../OSX/bindist.rtf" ; \ + U=$(UTILS_SRC)/version.h ; \ + V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ; \ + D=`date '+%d-%b-%Y'` ; \ + for S in $$files ; do \ + T=/tmp/xs.$$$$ ; \ + sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*[ab]*[0-9]*\(.*\)/\1$$V\2/" \ + -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/" \ + < $$S > $$T ; \ + if cmp -s $$S $$T ; then \ + true ; \ + else \ + cat $$T > $$S ; \ + echo "updated $$S to $$V $$D" ; \ + fi ; \ + done ; \ + rm $$T TAGS: tags tags: 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: @@ -713,6 +724,7 @@ $(UTILS_BIN)/usleep.o: $(UTILS_SRC)/usleep.c $(UTILS_BIN)/visual.o: $(UTILS_SRC)/visual.c $(UTILS_BIN)/xmu.o: $(UTILS_SRC)/xmu.c $(UTILS_BIN)/logo.o: $(UTILS_SRC)/logo.c +$(UTILS_BIN)/minixpm.o: $(UTILS_SRC)/minixpm.c $(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c $(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c @@ -784,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 -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 @@ -794,7 +806,7 @@ pdf2jpeg: $(PDF2JPEG_OBJS) TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \ - subprocs.o setuid.o splash.o prefs.o \ + subprocs.o setuid.o splash.o prefs.o mlstring.o exec.o \ $(SAVER_UTIL_OBJS) test-passwd.o: XScreenSaver_ad.h @@ -809,7 +821,7 @@ test-xdpms: test-xdpms.o $(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)\ + $(CC) $(LDFLAGS) -o $@ test-xinerama.o $(LIBS) $(X_LIBS) $(SAVER_LIBS) \ $(X_PRE_LIBS) $(XINERAMA_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) test-vp: test-vp.o @@ -826,6 +838,10 @@ test-grab: test-grab.o test-apm: test-apm.o $(CC) $(LDFLAGS) -o $@ test-apm.o $(SAVER_LIBS) -lapm +test-mlstring.o: mlstring.c +test-mlstring: test-mlstring.o + $(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS) + 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) @@ -847,6 +863,7 @@ xdpyinfo: xdpyinfo.o demo-Gtk-conf.o: ../config.h demo-Gtk-conf.o: $(srcdir)/demo-Gtk-conf.h +demo-Gtk-conf.o: $(UTILS_SRC)/xscreensaver-intl.h demo-Gtk.o: XScreenSaver_ad.h demo-Gtk.o: ../config.h demo-Gtk.o: $(srcdir)/demo-Gtk-conf.h @@ -854,6 +871,14 @@ 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: $(srcdir)/types.h +demo-Gtk.o: $(UTILS_SRC)/images/logo-180.xpm +demo-Gtk.o: $(UTILS_SRC)/images/logo-50.xpm +demo-Gtk.o: $(UTILS_SRC)/resources.h +demo-Gtk.o: $(UTILS_SRC)/usleep.h +demo-Gtk.o: $(UTILS_SRC)/version.h +demo-Gtk.o: $(UTILS_SRC)/visual.h +demo-Gtk.o: $(UTILS_SRC)/xscreensaver-intl.h demo-Gtk-support.o: ../config.h demo-Gtk-support.o: $(srcdir)/demo-Gtk-support.h demo-Gtk-widgets.o: ../config.h @@ -864,37 +889,69 @@ demo-Xm.o: ../config.h demo-Xm-widgets.o: ../config.h dpms.o: ../config.h dpms.o: $(srcdir)/prefs.h +dpms.o: $(srcdir)/types.h dpms.o: $(srcdir)/xscreensaver.h exec.o: ../config.h +exec.o: $(srcdir)/exec.h +lock.o: $(srcdir)/auth.h lock.o: ../config.h +lock.o: $(srcdir)/mlstring.h lock.o: $(srcdir)/prefs.h +lock.o: $(srcdir)/types.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: $(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 +prefs.o: $(srcdir)/types.h +prefs.o: $(UTILS_SRC)/resources.h remote.o: ../config.h remote.o: $(srcdir)/remote.h setuid.o: ../config.h setuid.o: $(srcdir)/prefs.h +setuid.o: $(srcdir)/types.h setuid.o: $(srcdir)/xscreensaver.h splash.o: ../config.h splash.o: $(srcdir)/prefs.h +splash.o: $(srcdir)/types.h +splash.o: $(UTILS_SRC)/resources.h splash.o: $(srcdir)/xscreensaver.h stderr.o: ../config.h stderr.o: $(srcdir)/prefs.h +stderr.o: $(srcdir)/types.h +stderr.o: $(UTILS_SRC)/resources.h +stderr.o: $(UTILS_SRC)/visual.h stderr.o: $(srcdir)/xscreensaver.h subprocs.o: ../config.h +subprocs.o: $(srcdir)/exec.h subprocs.o: $(srcdir)/prefs.h +subprocs.o: $(srcdir)/types.h +subprocs.o: $(UTILS_SRC)/visual.h +subprocs.o: $(UTILS_SRC)/yarandom.h subprocs.o: $(srcdir)/xscreensaver.h test-apm.o: ../config.h test-fade.o: ../config.h test-fade.o: $(srcdir)/prefs.h +test-fade.o: $(srcdir)/types.h +test-fade.o: $(UTILS_SRC)/fade.h test-fade.o: $(srcdir)/xscreensaver.h test-grab.o: ../config.h +test-mlstring.o: $(srcdir)/mlstring.c +test-mlstring.o: $(srcdir)/mlstring.h test-passwd.o: XScreenSaver_ad.h +test-passwd.o: $(srcdir)/auth.h test-passwd.o: ../config.h test-passwd.o: $(srcdir)/prefs.h +test-passwd.o: $(srcdir)/types.h +test-passwd.o: $(UTILS_SRC)/resources.h +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-uid.o: ../config.h @@ -903,20 +960,42 @@ test-xdpms.o: ../config.h test-xinerama.o: ../config.h timers.o: ../config.h timers.o: $(srcdir)/prefs.h +timers.o: $(srcdir)/types.h timers.o: $(srcdir)/xscreensaver.h windows.o: ../config.h windows.o: $(srcdir)/prefs.h +windows.o: $(srcdir)/types.h +windows.o: $(UTILS_SRC)/fade.h +windows.o: $(UTILS_SRC)/visual.h windows.o: $(srcdir)/xscreensaver.h xscreensaver-command.o: ../config.h xscreensaver-command.o: $(srcdir)/remote.h +xscreensaver-command.o: $(UTILS_SRC)/version.h xscreensaver-getimage.o: ../config.h xscreensaver-getimage.o: XScreenSaver_ad.h xscreensaver-getimage.o: $(srcdir)/prefs.h +xscreensaver-getimage.o: $(srcdir)/types.h +xscreensaver-getimage.o: $(UTILS_SRC)/colorbars.h +xscreensaver-getimage.o: $(UTILS_SRC)/grabscreen.h +xscreensaver-getimage.o: $(UTILS_SRC)/resources.h +xscreensaver-getimage.o: $(UTILS_SRC)/utils.h +xscreensaver-getimage.o: $(UTILS_SRC)/version.h +xscreensaver-getimage.o: $(UTILS_SRC)/visual.h +xscreensaver-getimage.o: $(UTILS_SRC)/vroot.h +xscreensaver-getimage.o: $(UTILS_SRC)/yarandom.h xscreensaver.o: XScreenSaver_ad.h +xscreensaver.o: $(srcdir)/auth.h xscreensaver.o: ../config.h xscreensaver.o: $(srcdir)/prefs.h +xscreensaver.o: $(srcdir)/types.h +xscreensaver.o: $(UTILS_SRC)/resources.h +xscreensaver.o: $(UTILS_SRC)/usleep.h +xscreensaver.o: $(UTILS_SRC)/version.h +xscreensaver.o: $(UTILS_SRC)/visual.h +xscreensaver.o: $(UTILS_SRC)/yarandom.h xscreensaver.o: $(srcdir)/xscreensaver.h xset.o: ../config.h xset.o: $(srcdir)/prefs.h +xset.o: $(srcdir)/types.h xset.o: $(srcdir)/xscreensaver.h