X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FMakefile.in;h=e7a07d9c4dea9b00349b071ad7f19508d2f60d69;hp=aba8fd87bd2ea68c0ad84c521208f30dfbadaa53;hb=07faf451b99879183ed7e909e43a0e065be1ee7f;hpb=447db08c956099b3b183886729108bf5b364c4b8 diff --git a/driver/Makefile.in b/driver/Makefile.in index aba8fd87..e7a07d9c 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -152,27 +152,31 @@ 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 @@ -219,7 +223,7 @@ 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 MEN_1 = xscreensaver.man xscreensaver-demo.man \ @@ -350,24 +354,45 @@ munge-scripts: $(SCRIPTS) if cmp -s $(srcdir)/$$program $$tmp ; then \ true ; \ else \ - echo "$$program: setting interpreter to $$perl" ; \ + echo "$$program: setting interpreter to $$perl" >&2 ; \ cat $$tmp > ./$$program ; \ fi ; \ done ; \ rm -f $$tmp +# When installing man pages, we install "foo.man" as "foo.N" and update +# the .TH line in the installed file with one like +# +# .TH XScreenSaver N "V.VV (DD-MMM-YYYY)" "X Version 11" +# +# where N is the manual section suffix. +# install-man: $(MEN) @men="$(MEN)" ; \ + U=$(UTILS_SRC)/version.h ; \ + 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" ; \ + \ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ + \ 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 ; \ - $(INSTALL_DATA) $(srcdir)/$$man \ + $(INSTALL_DATA) $$T \ $(install_prefix)$(manNdir)/$$instname ; \ - done + done ; \ + rm -f $$T uninstall-program: @for program in $(EXES) $(SCRIPTS); do \ @@ -382,8 +407,8 @@ uninstall-man: @men="$(MEN)" ; \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ - echo rm -f $(install_prefix)$(manNdir)/$$instname ; \ - rm -f $(install_prefix)$(manNdir)/$$instname ; \ + echo rm -f $(install_prefix)$(manNdir)/$$instname* ; \ + rm -f $(install_prefix)$(manNdir)/$$instname* ; \ done install-pam: @@ -447,7 +472,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 " ####################################################################";\ @@ -543,7 +570,7 @@ install-gnome:: xscreensaver-demo.glade2 # into /usr/share/applications/ uninstall-gnome:: @if [ "$(GTK_DATADIR)" != "" ]; then \ - f=screensaver-properties.desktop ;\ + f=gnome-screensaver-properties.desktop ;\ echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ fi @@ -597,7 +624,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 @@ -611,7 +638,7 @@ depend: XScreenSaver_ad.h XScreenSaver_Xm_ad.h # close. This excludes dependencies on files in /usr/include, etc. It tries # to include only dependencies on files which are themselves a part of this # package. -distdepend: check_men update_ad_version update_man_version XScreenSaver_ad.h XScreenSaver_Xm_ad.h +distdepend: check_men update_ad_version XScreenSaver_ad.h XScreenSaver_Xm_ad.h @echo updating dependencies in `pwd`/Makefile.in... ; \ $(DEPEND) -w 0 -f - \ -s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \ @@ -640,40 +667,24 @@ distdepend: check_men update_ad_version update_man_version XScreenSaver_ad.h XSc # 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 - -update_man_version:: - @for S in $(MEN); do \ - U=$(UTILS_SRC)/version.h ; \ - V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ; \ - V="`date '+%d-%b-%Y'` ($$V)" ; \ - T=/tmp/xs.$$$$ ; \ - sed "s/^\(\.TH[^\"]*\)\"[^\"]*\"\(.*\)/\1\"$$V\"\2/" \ - < $$S > $$T ; \ - if cmp -s $$S $$T ; then \ - true ; \ - else \ - cat $$T > $$S ; \ - echo "updated $$S to \"$$V\"" ; \ - fi ; \ - rm $$T ; \ - done + @ \ + 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: @@ -712,6 +723,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 @@ -782,6 +794,9 @@ xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS) $(GTK_LIBS) $(XPM_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) \ -lXt -lX11 $(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS) +demo-Gtk.o: XScreenSaver_ad.h +demo-Xm.o: XScreenSaver_ad_Xm.h + xscreensaver-getimage: $(GETIMG_OBJS) $(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm @@ -843,13 +858,13 @@ xdpyinfo: xdpyinfo.o 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 @@ -862,6 +877,7 @@ dpms.o: ../config.h dpms.o: $(srcdir)/prefs.h dpms.o: $(srcdir)/xscreensaver.h exec.o: ../config.h +exec.o: $(srcdir)/exec.h lock.o: ../config.h lock.o: $(srcdir)/prefs.h lock.o: $(srcdir)/xscreensaver.h @@ -881,6 +897,7 @@ stderr.o: ../config.h stderr.o: $(srcdir)/prefs.h stderr.o: $(srcdir)/xscreensaver.h subprocs.o: ../config.h +subprocs.o: $(srcdir)/exec.h subprocs.o: $(srcdir)/prefs.h subprocs.o: $(srcdir)/xscreensaver.h test-apm.o: ../config.h @@ -888,9 +905,9 @@ test-fade.o: ../config.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-randr.o: ../config.h test-uid.o: ../config.h @@ -908,9 +925,9 @@ xscreensaver-command.o: $(srcdir)/remote.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