diff -u sivp-0.5.0/debian/rules sivp-0.5.0/debian/rules --- sivp-0.5.0/debian/rules +++ sivp-0.5.0/debian/rules @@ -2,8 +2,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr/lib +DEB_CONFIGURE_SCRIPT_ENV=SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 get-orig-source: -uscan --upstream-version 0 --rename diff -u sivp-0.5.0/debian/changelog sivp-0.5.0/debian/changelog --- sivp-0.5.0/debian/changelog +++ sivp-0.5.0/debian/changelog @@ -1,3 +1,13 @@ +sivp (0.5.0-1ubuntu2) jaunty; urgency=low + + * debian/rules: + DEB_CONFIGURE_SCRIPT_ENV=SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 + Should prevent scilab trying to load the GUI in configure. + (Closes LP: #343155) + * debian/patches/javaHeadless.diff: Disable GUI when calling scilab. + + -- Christoph Korn Mon, 16 Mar 2009 14:43:31 +0100 + sivp (0.5.0-1ubuntu1) jaunty; urgency=low [ Sylvestre Ledru ] diff -u sivp-0.5.0/debian/control sivp-0.5.0/debian/control --- sivp-0.5.0/debian/control +++ sivp-0.5.0/debian/control @@ -7,7 +7,7 @@ Torsten Werner , Shiqi Yu Build-Depends: debhelper (>= 5), autotools-dev, cdbs, libcv-dev (>= 0.9.6), scilab (>= 3.1), libhighgui-dev (> 0.9.6), xsltproc, pvm, docbook-xsl, - scilab-doc (>= 5.0), libraw1394-dev, libtheora-dev, libvorbis-dev + scilab-doc (>= 5.0), libraw1394-dev, libtheora-dev, libvorbis-dev, quilt Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/sivp/trunk Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/sivp/trunk only in patch2: unchanged: --- sivp-0.5.0.orig/debian/patches/javaHeadless.diff +++ sivp-0.5.0/debian/patches/javaHeadless.diff @@ -0,0 +1,3084 @@ +diff -Nur sivp-0.5.0.orig/demos/Makefile.in sivp-0.5.0/demos/Makefile.in +--- sivp-0.5.0.orig/demos/Makefile.in 2008-09-27 05:14:22.000000000 +0200 ++++ sivp-0.5.0/demos/Makefile.in 2009-03-16 18:08:27.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,11 +14,16 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. ++ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -30,30 +35,10 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = demos +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/src/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(demosdir)" +-demosDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(demos_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -83,7 +68,6 @@ + FFLAGS = @FFLAGS@ + GREP = @GREP@ + HELPDIR = @HELPDIR@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -95,7 +79,6 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OPENCV_CFLAGS = @OPENCV_CFLAGS@ +@@ -119,14 +102,15 @@ + TOOLBOX_FUNCTIONS = @TOOLBOX_FUNCTIONS@ + TOOLBOX_TABLE = @TOOLBOX_TABLE@ + VERSION = @VERSION@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ ++am__isrc = @am__isrc@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ +@@ -137,7 +121,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -168,69 +151,58 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ ++ + demos = sivp.dem image.sce canny.sce noise.sce video.sce camera.sce camshift.sce bgfg.sce face.sce eye.sce + demosdir = @TOOLBOXDIR@/demos ++ + demos_DATA = $(demos) + EXTRA_DIST = $(demos) ++subdir = demos ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/src/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(demos_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu demos/Makefile'; \ ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu demos/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++demosDATA_INSTALL = $(INSTALL_DATA) + install-demosDATA: $(demos_DATA) + @$(NORMAL_INSTALL) +- test -z "$(demosdir)" || $(MKDIR_P) "$(DESTDIR)$(demosdir)" ++ $(mkinstalldirs) $(DESTDIR)$(demosdir) + @list='$(demos_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(demosDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(demosdir)/$$f'"; \ +- $(demosDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(demosdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(demosDATA_INSTALL) $$d$$p $(DESTDIR)$(demosdir)/$$f"; \ ++ $(demosDATA_INSTALL) $$d$$p $(DESTDIR)$(demosdir)/$$f; \ + done + + uninstall-demosDATA: + @$(NORMAL_UNINSTALL) + @list='$(demos_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(demosdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(demosdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(demosdir)/$$f"; \ ++ rm -f $(DESTDIR)$(demosdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -238,23 +210,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -268,10 +245,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(demosdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(demosdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -291,7 +267,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -302,34 +278,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-demosDATA + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -348,21 +314,17 @@ + + ps-am: + +-uninstall-am: uninstall-demosDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-demosDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-demosDATA install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-demosDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-demosDATA install-exec install-exec-am \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-demosDATA uninstall-info-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur sivp-0.5.0.orig/etc/Makefile.in sivp-0.5.0/etc/Makefile.in +--- sivp-0.5.0.orig/etc/Makefile.in 2008-09-27 05:14:22.000000000 +0200 ++++ sivp-0.5.0/etc/Makefile.in 2009-03-16 18:08:27.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,11 +14,16 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. ++ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -30,30 +35,10 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = etc +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/src/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(etcdir)" +-etcDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(etc_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -83,7 +68,6 @@ + FFLAGS = @FFLAGS@ + GREP = @GREP@ + HELPDIR = @HELPDIR@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -95,7 +79,6 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OPENCV_CFLAGS = @OPENCV_CFLAGS@ +@@ -119,14 +102,15 @@ + TOOLBOX_FUNCTIONS = @TOOLBOX_FUNCTIONS@ + TOOLBOX_TABLE = @TOOLBOX_TABLE@ + VERSION = @VERSION@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ ++am__isrc = @am__isrc@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ +@@ -137,7 +121,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -168,69 +151,58 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ ++ + etc = haarcascade_frontalface_alt2.xml lefteye.xml righteye.xml + etcdir = @TOOLBOXDIR@/etc ++ + etc_DATA = $(etc) + EXTRA_DIST = $(etc) ++subdir = etc ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/src/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(etc_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/Makefile'; \ ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu etc/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++etcDATA_INSTALL = $(INSTALL_DATA) + install-etcDATA: $(etc_DATA) + @$(NORMAL_INSTALL) +- test -z "$(etcdir)" || $(MKDIR_P) "$(DESTDIR)$(etcdir)" ++ $(mkinstalldirs) $(DESTDIR)$(etcdir) + @list='$(etc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(etcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(etcdir)/$$f'"; \ +- $(etcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(etcdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(etcDATA_INSTALL) $$d$$p $(DESTDIR)$(etcdir)/$$f"; \ ++ $(etcDATA_INSTALL) $$d$$p $(DESTDIR)$(etcdir)/$$f; \ + done + + uninstall-etcDATA: + @$(NORMAL_UNINSTALL) + @list='$(etc_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(etcdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(etcdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(etcdir)/$$f"; \ ++ rm -f $(DESTDIR)$(etcdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -238,23 +210,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -268,10 +245,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(etcdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(etcdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -291,7 +267,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -302,34 +278,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-etcDATA + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -348,21 +314,17 @@ + + ps-am: + +-uninstall-am: uninstall-etcDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-etcDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-etcDATA install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-etcDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-etcDATA install-exec install-exec-am \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-etcDATA uninstall-info-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur sivp-0.5.0.orig/help/Makefile.in sivp-0.5.0/help/Makefile.in +--- sivp-0.5.0.orig/help/Makefile.in 2008-09-27 05:14:22.000000000 +0200 ++++ sivp-0.5.0/help/Makefile.in 2009-03-16 18:08:27.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,11 +14,16 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. ++ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -30,30 +35,10 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = help +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/src/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(helpdir)" +-helpDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(help_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -83,7 +68,6 @@ + FFLAGS = @FFLAGS@ + GREP = @GREP@ + HELPDIR = @HELPDIR@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -95,7 +79,6 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OPENCV_CFLAGS = @OPENCV_CFLAGS@ +@@ -119,14 +102,15 @@ + TOOLBOX_FUNCTIONS = @TOOLBOX_FUNCTIONS@ + TOOLBOX_TABLE = @TOOLBOX_TABLE@ + VERSION = @VERSION@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ ++am__isrc = @am__isrc@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ +@@ -137,7 +121,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -168,87 +151,59 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ +-helppages_xml = en_US/addframe.xml en_US/avicloseall.xml \ +- en_US/aviclose.xml en_US/avifile.xml en_US/aviinfo.xml \ +- en_US/avilistopened.xml en_US/aviopen.xml \ +- en_US/avireadframe.xml en_US/camopen.xml en_US/camshift.xml \ +- en_US/corr2.xml en_US/detecteyes.xml en_US/detectfaces.xml \ +- en_US/detectforeground.xml en_US/edge.xml en_US/filter2.xml \ +- en_US/fspecial.xml en_US/hsv2rgb.xml en_US/im2bw.xml \ +- en_US/im2double.xml en_US/im2int16.xml en_US/im2int32.xml \ +- en_US/im2int8.xml en_US/im2uint16.xml en_US/im2uint8.xml \ +- en_US/imabsdiff.xml en_US/imadd.xml en_US/imcomplement.xml \ +- en_US/imcrop.xml en_US/imdivide.xml en_US/imfilter.xml \ +- en_US/imfinfo.xml en_US/imhist.xml en_US/imlincomb.xml \ +- en_US/immultiply.xml en_US/imnoise.xml en_US/impyramid.xml \ +- en_US/imread.xml en_US/imresize.xml en_US/imshow.xml \ +- en_US/imsubtract.xml en_US/imwrite.xml en_US/ind2rgb.xml \ +- en_US/mat2gray.xml en_US/mean2.xml en_US/meanshift.xml \ +- en_US/ntsc2rgb.xml en_US/rectangle.xml en_US/rgb2gray.xml \ +- en_US/rgb2hsv.xml en_US/rgb2ntsc.xml en_US/rgb2ycbcr.xml \ +- en_US/std2.xml en_US/xs2im.xml en_US/ycbcr2rgb.xml ++ ++helppages_xml = en_US/addframe.xml en_US/avicloseall.xml en_US/aviclose.xml en_US/avifile.xml en_US/aviinfo.xml en_US/avilistopened.xml en_US/aviopen.xml en_US/avireadframe.xml en_US/camopen.xml en_US/camshift.xml en_US/corr2.xml en_US/detecteyes.xml en_US/detectfaces.xml en_US/detectforeground.xml en_US/edge.xml en_US/filter2.xml en_US/fspecial.xml en_US/hsv2rgb.xml en_US/im2bw.xml en_US/im2double.xml en_US/im2int16.xml en_US/im2int32.xml en_US/im2int8.xml en_US/im2uint16.xml en_US/im2uint8.xml en_US/imabsdiff.xml en_US/imadd.xml en_US/imcomplement.xml en_US/imcrop.xml en_US/imdivide.xml en_US/imfilter.xml en_US/imfinfo.xml en_US/imhist.xml en_US/imlincomb.xml en_US/immultiply.xml en_US/imnoise.xml en_US/impyramid.xml en_US/imread.xml en_US/imresize.xml en_US/imshow.xml en_US/imsubtract.xml en_US/imwrite.xml en_US/ind2rgb.xml en_US/mat2gray.xml en_US/mean2.xml en_US/meanshift.xml en_US/ntsc2rgb.xml en_US/rectangle.xml en_US/rgb2gray.xml en_US/rgb2hsv.xml en_US/rgb2ntsc.xml en_US/rgb2ycbcr.xml en_US/std2.xml en_US/xs2im.xml en_US/ycbcr2rgb.xml ++ + helpdir = @TOOLBOXDIR@/jar + help_DATA = ../jar/scilab_en_US_help.jar ++ + EXTRA_DIST = $(helppages_xml) en_US/build_help.sce buildhelp.sce ++subdir = help ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/src/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(help_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \ ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++helpDATA_INSTALL = $(INSTALL_DATA) + install-helpDATA: $(help_DATA) + @$(NORMAL_INSTALL) +- test -z "$(helpdir)" || $(MKDIR_P) "$(DESTDIR)$(helpdir)" ++ $(mkinstalldirs) $(DESTDIR)$(helpdir) + @list='$(help_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(helpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(helpdir)/$$f'"; \ +- $(helpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(helpdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(helpDATA_INSTALL) $$d$$p $(DESTDIR)$(helpdir)/$$f"; \ ++ $(helpDATA_INSTALL) $$d$$p $(DESTDIR)$(helpdir)/$$f; \ + done + + uninstall-helpDATA: + @$(NORMAL_UNINSTALL) + @list='$(help_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(helpdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(helpdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(helpdir)/$$f"; \ ++ rm -f $(DESTDIR)$(helpdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -256,23 +211,29 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ $(mkinstalldirs) $(distdir)/en_US ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -286,10 +247,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(helpdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(helpdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -309,43 +269,35 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ + clean-am: clean-generic clean-libtool mostlyclean-am + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-helpDATA + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -364,21 +316,17 @@ + + ps-am: + +-uninstall-am: uninstall-helpDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-helpDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-helpDATA install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-helpDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-helpDATA \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-helpDATA uninstall-info-am + + + all: $(help_DATA) +diff -Nur sivp-0.5.0.orig/images/Makefile.in sivp-0.5.0/images/Makefile.in +--- sivp-0.5.0.orig/images/Makefile.in 2008-09-27 05:14:22.000000000 +0200 ++++ sivp-0.5.0/images/Makefile.in 2009-03-16 18:08:27.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,11 +14,16 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. ++ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -30,30 +35,10 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = images +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/src/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(imagesdir)" +-imagesDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(images_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -83,7 +68,6 @@ + FFLAGS = @FFLAGS@ + GREP = @GREP@ + HELPDIR = @HELPDIR@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -95,7 +79,6 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OPENCV_CFLAGS = @OPENCV_CFLAGS@ +@@ -119,14 +102,15 @@ + TOOLBOX_FUNCTIONS = @TOOLBOX_FUNCTIONS@ + TOOLBOX_TABLE = @TOOLBOX_TABLE@ + VERSION = @VERSION@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ ++am__isrc = @am__isrc@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ +@@ -137,7 +121,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -168,69 +151,58 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ ++ + images = lena.png baboon.png peppers.png people.jpg video.avi red-car-video.avi + imagesdir = @TOOLBOXDIR@/images ++ + images_DATA = $(images) + EXTRA_DIST = $(images) ++subdir = images ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/src/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(images_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Makefile'; \ ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu images/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++imagesDATA_INSTALL = $(INSTALL_DATA) + install-imagesDATA: $(images_DATA) + @$(NORMAL_INSTALL) +- test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)" ++ $(mkinstalldirs) $(DESTDIR)$(imagesdir) + @list='$(images_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$f'"; \ +- $(imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f"; \ ++ $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f; \ + done + + uninstall-imagesDATA: + @$(NORMAL_UNINSTALL) + @list='$(images_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(imagesdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(imagesdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(imagesdir)/$$f"; \ ++ rm -f $(DESTDIR)$(imagesdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -238,23 +210,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -268,10 +245,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(imagesdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(imagesdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -291,7 +267,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -302,34 +278,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-imagesDATA + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -348,21 +314,17 @@ + + ps-am: + +-uninstall-am: uninstall-imagesDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-imagesDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-imagesDATA install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-imagesDATA ++ dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-imagesDATA \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-imagesDATA uninstall-info-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur sivp-0.5.0.orig/macros/Makefile.am sivp-0.5.0/macros/Makefile.am +--- sivp-0.5.0.orig/macros/Makefile.am 2008-09-25 12:42:48.000000000 +0200 ++++ sivp-0.5.0/macros/Makefile.am 2009-03-16 18:05:55.000000000 +0100 +@@ -31,7 +31,7 @@ + + + $(macros_bin) names lib: $(macros_sci) +- $(SCIEXE) -nw -nb -f buildmacros.sce ; ++ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(SCIEXE) -nw -nb -f buildmacros.sce ; + + clean-local: + rm -f tmp_* *.bin lib names Lib.mak Macros.mak genlib Sci_Name Sci_Lib +diff -Nur sivp-0.5.0.orig/macros/Makefile.in sivp-0.5.0/macros/Makefile.in +--- sivp-0.5.0.orig/macros/Makefile.in 2008-09-27 05:14:22.000000000 +0200 ++++ sivp-0.5.0/macros/Makefile.in 2009-03-16 18:08:27.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,11 +14,16 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. ++ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -30,30 +35,10 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = macros +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/src/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(macrodir)" +-macroDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(macro_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -83,7 +68,6 @@ + FFLAGS = @FFLAGS@ + GREP = @GREP@ + HELPDIR = @HELPDIR@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -95,7 +79,6 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OPENCV_CFLAGS = @OPENCV_CFLAGS@ +@@ -119,14 +102,15 @@ + TOOLBOX_FUNCTIONS = @TOOLBOX_FUNCTIONS@ + TOOLBOX_TABLE = @TOOLBOX_TABLE@ + VERSION = @VERSION@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ ++am__isrc = @am__isrc@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ +@@ -137,7 +121,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -168,70 +151,60 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + macros_sci = corr2.sci detectfaces.sci detectlefteyes.sci detectrighteyes.sci edge.sci fspecial.sci hsv2rgb.sci im2bw.sci im2double.sci im2int16.sci im2int32.sci im2int8.sci im2uint16.sci im2uint8.sci imabsdiff.sci imadd.sci imcomplement.sci imcrop.sci imdivide.sci imhist.sci imlincomb.sci immultiply.sci imnoise.sci imresize.sci imshow.sci imsubtract.sci imwrite.sci isbw.sci mat2gray.sci mean2.sci ntsc2rgb.sci rectangle.sci rgb2gray.sci rgb2hsv.sci rgb2ntsc.sci rgb2ycbcr.sci std2.sci stdev2.sci xs2im.sci ycbcr2rgb.sci ++ + macros_bin = $(macros_sci:.sci=.bin) ++ + macrodir = @TOOLBOXDIR@/macros + macro_DATA = $(macros_bin) names lib imshow.tcl ++ + EXTRA_DIST = $(macros_sci) imshow.tcl buildmacros.sce ++subdir = macros ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/src/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(macro_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu macros/Makefile'; \ ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu macros/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++macroDATA_INSTALL = $(INSTALL_DATA) + install-macroDATA: $(macro_DATA) + @$(NORMAL_INSTALL) +- test -z "$(macrodir)" || $(MKDIR_P) "$(DESTDIR)$(macrodir)" ++ $(mkinstalldirs) $(DESTDIR)$(macrodir) + @list='$(macro_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(macroDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(macrodir)/$$f'"; \ +- $(macroDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(macrodir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(macroDATA_INSTALL) $$d$$p $(DESTDIR)$(macrodir)/$$f"; \ ++ $(macroDATA_INSTALL) $$d$$p $(DESTDIR)$(macrodir)/$$f; \ + done + + uninstall-macroDATA: + @$(NORMAL_UNINSTALL) + @list='$(macro_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(macrodir)/$$f'"; \ +- rm -f "$(DESTDIR)$(macrodir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(macrodir)/$$f"; \ ++ rm -f $(DESTDIR)$(macrodir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -239,23 +212,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -269,10 +247,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(macrodir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(macrodir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -292,7 +269,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -303,34 +280,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-macroDATA + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -349,25 +316,21 @@ + + ps-am: + +-uninstall-am: uninstall-macroDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-macroDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-macroDATA \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-macroDATA ++ distdir dvi dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-info \ ++ install-info-am install-macroDATA install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am uninstall-macroDATA + + + $(macros_bin) names lib: $(macros_sci) +- $(SCIEXE) -nw -nb -f buildmacros.sce ; ++ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(SCIEXE) -nw -nb -f buildmacros.sce ; + + clean-local: + rm -f tmp_* *.bin lib names Lib.mak Macros.mak genlib Sci_Name Sci_Lib +diff -Nur sivp-0.5.0.orig/Makefile.in sivp-0.5.0/Makefile.in +--- sivp-0.5.0.orig/Makefile.in 2008-09-27 05:14:23.000000000 +0200 ++++ sivp-0.5.0/Makefile.in 2009-03-16 18:08:27.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,11 +14,16 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = . ++ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -30,59 +35,10 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/loader.sce.in \ +- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ +- TODO config/config.guess config/config.sub config/depcomp \ +- config/install-sh config/ltmain.sh config/missing \ +- config/mkinstalldirs +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno config.status.lineno +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/src/config.h +-CONFIG_CLEAN_FILES = loader.sce +-SOURCES = +-DIST_SOURCES = +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(toolboxdir)" +-toolboxDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(toolbox_DATA) +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-distdir = $(PACKAGE)-$(VERSION) +-top_distdir = $(distdir) +-am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -112,7 +68,6 @@ + FFLAGS = @FFLAGS@ + GREP = @GREP@ + HELPDIR = @HELPDIR@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -124,7 +79,6 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OPENCV_CFLAGS = @OPENCV_CFLAGS@ +@@ -148,14 +102,15 @@ + TOOLBOX_FUNCTIONS = @TOOLBOX_FUNCTIONS@ + TOOLBOX_TABLE = @TOOLBOX_TABLE@ + VERSION = @VERSION@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ ++am__isrc = @am__isrc@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ +@@ -166,7 +121,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -197,11 +151,8 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ + + #AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = ChangeLog TODO BUGS COPYING INSTALL libtool Makefile.in NEWS README \ +@@ -211,46 +162,51 @@ + config/sivp_xmltohtml.sci \ + config/subst_input_files.sh + ++ + SUBDIRS = src macros images demos etc @HELPDIR@ ++ + toolboxdir = @TOOLBOXDIR@ + toolbox_DATA = loader.sce builder.sce ++subdir = . ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/src/config.h ++CONFIG_CLEAN_FILES = loader.sce ++DIST_SOURCES = ++DATA = $(toolbox_DATA) ++ ++ ++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ++ ps-recursive install-info-recursive uninstall-info-recursive \ ++ all-recursive install-data-recursive install-exec-recursive \ ++ installdirs-recursive install-recursive uninstall-recursive \ ++ check-recursive installcheck-recursive ++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ ++ COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \ ++ config/config.guess config/config.sub config/depcomp \ ++ config/install-sh config/ltmain.sh config/missing \ ++ config/mkinstalldirs configure configure.ac loader.sce.in ++DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-am--refresh: +- @: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ +- cd $(srcdir) && $(AUTOMAKE) --gnu \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- echo ' $(SHELL) ./config.status'; \ +- $(SHELL) ./config.status;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ +- esac; ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) + +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +- +-$(top_srcdir)/configure: $(am__configure_deps) ++$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ ++$(ACLOCAL_M4): configure.ac + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +-loader.sce: $(top_builddir)/config.status $(srcdir)/loader.sce.in ++loader.sce: $(top_builddir)/config.status loader.sce.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + + mostlyclean-libtool: +@@ -261,22 +217,24 @@ + + distclean-libtool: + -rm -f libtool ++uninstall-info-am: ++toolboxDATA_INSTALL = $(INSTALL_DATA) + install-toolboxDATA: $(toolbox_DATA) + @$(NORMAL_INSTALL) +- test -z "$(toolboxdir)" || $(MKDIR_P) "$(DESTDIR)$(toolboxdir)" ++ $(mkinstalldirs) $(DESTDIR)$(toolboxdir) + @list='$(toolbox_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(toolboxDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(toolboxdir)/$$f'"; \ +- $(toolboxDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(toolboxdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(toolboxDATA_INSTALL) $$d$$p $(DESTDIR)$(toolboxdir)/$$f"; \ ++ $(toolboxDATA_INSTALL) $$d$$p $(DESTDIR)$(toolboxdir)/$$f; \ + done + + uninstall-toolboxDATA: + @$(NORMAL_UNINSTALL) + @list='$(toolbox_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(toolboxdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(toolboxdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(toolboxdir)/$$f"; \ ++ rm -f $(DESTDIR)$(toolboxdir)/$$f; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -286,13 +244,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -304,20 +256,15 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -338,7 +285,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ ++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -349,30 +296,35 @@ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ++ETAGS = etags ++ETAGSFLAGS = ++ ++CTAGS = ctags ++CTAGSFLAGS = ++ ++tags: TAGS ++ + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + mkid -fID $$unique +-tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +- empty_fix=.; \ + else \ + include_option=--include; \ +- empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ ++ test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -380,23 +332,23 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ ++ here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -408,25 +360,40 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = . ++distdir = $(PACKAGE)-$(VERSION) ++ ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++ ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print + + distdir: $(DISTFILES) + $(am__remove_distdir) +- test -d $(distdir) || mkdir $(distdir) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ mkdir $(distdir) ++ $(mkinstalldirs) $(distdir)/. $(distdir)/config $(distdir)/src ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -437,19 +404,15 @@ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ test -d $(distdir)/$$subdir \ ++ || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ ++ top_distdir="$(top_distdir)" \ ++ distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ +@@ -457,55 +420,22 @@ + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ++ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) +- +-dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 +- $(am__remove_distdir) +- +-dist-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-tarZ: distdir +- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z +- $(am__remove_distdir) +- +-dist-shar: distdir +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz +- $(am__remove_distdir) +- +-dist-zip: distdir +- -rm -f $(distdir).zip +- zip -rq $(distdir).zip $(distdir) ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + dist dist-all: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then + # it guarantees that the distribution is self-contained by making another + # tarfile. + distcheck: dist +- case '$(DIST_ARCHIVES)' in \ +- *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ +- *.zip*) \ +- unzip $(distdir).zip ;;\ +- esac ++ $(am__remove_distdir) ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst +@@ -525,20 +455,19 @@ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ +- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ +- && $(MAKE) $(AM_MAKEFLAGS) dist \ +- && rm -rf $(DIST_ARCHIVES) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ ++ && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) +- @(echo "$(distdir) archives ready for distribution: "; \ +- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' ++ @echo "$(distdir).tar.gz is ready for distribution" | \ ++ sed 'h;s/./=/g;p;x;p;x' + distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +@@ -562,9 +491,8 @@ + all-am: Makefile $(DATA) + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(toolboxdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(toolboxdir) ++ + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -584,7 +512,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -603,28 +531,18 @@ + + dvi-am: + +-html: html-recursive +- + info: info-recursive + + info-am: + + install-data-am: install-toolboxDATA + +-install-dvi: install-dvi-recursive +- + install-exec-am: + +-install-html: install-html-recursive +- + install-info: install-info-recursive + + install-man: + +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -645,26 +563,27 @@ + + ps-am: + +-uninstall-am: uninstall-toolboxDATA ++uninstall-am: uninstall-info-am uninstall-toolboxDATA + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip ++uninstall-info: uninstall-info-recursive + +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am am--refresh check check-am clean clean-generic \ +- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ +- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ +- distclean distclean-generic distclean-libtool distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip install-toolboxDATA \ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ++ clean-generic clean-libtool clean-recursive ctags \ ++ ctags-recursive dist dist-all dist-gzip distcheck distclean \ ++ distclean-generic distclean-libtool distclean-recursive \ ++ distclean-tags distcleancheck distdir distuninstallcheck dvi \ ++ dvi-am dvi-recursive info info-am info-recursive install \ ++ install-am install-data install-data-am install-data-recursive \ ++ install-exec install-exec-am install-exec-recursive \ ++ install-info install-info-am install-info-recursive install-man \ ++ install-recursive install-strip install-toolboxDATA \ + installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am \ ++ installdirs-recursive maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ++ pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ++ uninstall uninstall-am uninstall-info-am \ ++ uninstall-info-recursive uninstall-recursive \ + uninstall-toolboxDATA + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Nur sivp-0.5.0.orig/man/Makefile.in sivp-0.5.0/man/Makefile.in +--- sivp-0.5.0.orig/man/Makefile.in 2008-09-27 05:05:18.000000000 +0200 ++++ sivp-0.5.0/man/Makefile.in 2009-03-16 18:08:27.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,11 +14,16 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. ++ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -30,30 +35,10 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = man +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/src/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(helpdir)" +-helpDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(help_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -83,7 +68,6 @@ + FFLAGS = @FFLAGS@ + GREP = @GREP@ + HELPDIR = @HELPDIR@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -95,7 +79,6 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OPENCV_CFLAGS = @OPENCV_CFLAGS@ +@@ -109,6 +92,7 @@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + RANLIB = @RANLIB@ ++ + SCIDIR = @SCIDIR@ + SCIEXE = @SCIEXE@ + SED = @SED@ +@@ -119,14 +103,15 @@ + TOOLBOX_FUNCTIONS = @TOOLBOX_FUNCTIONS@ + TOOLBOX_TABLE = @TOOLBOX_TABLE@ + VERSION = @VERSION@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ ++am__isrc = @am__isrc@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ +@@ -137,7 +122,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -168,71 +152,63 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ ++ + manpages_xml = addframe.xml avicloseall.xml aviclose.xml avifile.xml aviinfo.xml avilistopened.xml aviopen.xml avireadframe.xml camopen.xml camshift.xml corr2.xml detecteyes.xml detectfaces.xml detectforeground.xml edge.xml filter2.xml fspecial.xml hsv2rgb.xml im2bw.xml im2double.xml im2int16.xml im2int32.xml im2int8.xml im2uint16.xml im2uint8.xml imabsdiff.xml imadd.xml imcomplement.xml imcrop.xml imdivide.xml imfilter.xml imfinfo.xml imhist.xml imlincomb.xml immultiply.xml imnoise.xml impyramid.xml imread.xml imresize.xml imshow.xml imsubtract.xml imwrite.xml ind2rgb.xml mat2gray.xml mean2.xml meanshift.xml ntsc2rgb.xml rectangle.xml rgb2gray.xml rgb2hsv.xml rgb2ntsc.xml rgb2ycbcr.xml std2.xml xs2im.xml ycbcr2rgb.xml ++ + manpages_cat = $(manpages_xml:.xml=.cat) ++ + manpages_html = $(manpages_xml:.xml=.htm) ++ + helpdir = @TOOLBOXDIR@/man + help_DATA = $(manpages_html) whatis.htm ++ + EXTRA_DIST = $(manpages_xml) html-sivp.xsl mansivp.dtd Makefile.am.input ++subdir = man ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/src/config.h ++CONFIG_CLEAN_FILES = ++DIST_SOURCES = ++DATA = $(help_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++helpDATA_INSTALL = $(INSTALL_DATA) + install-helpDATA: $(help_DATA) + @$(NORMAL_INSTALL) +- test -z "$(helpdir)" || $(MKDIR_P) "$(DESTDIR)$(helpdir)" ++ $(mkinstalldirs) $(DESTDIR)$(helpdir) + @list='$(help_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(helpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(helpdir)/$$f'"; \ +- $(helpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(helpdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(helpDATA_INSTALL) $$d$$p $(DESTDIR)$(helpdir)/$$f"; \ ++ $(helpDATA_INSTALL) $$d$$p $(DESTDIR)$(helpdir)/$$f; \ + done + + uninstall-helpDATA: + @$(NORMAL_UNINSTALL) + @list='$(help_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(helpdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(helpdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(helpdir)/$$f"; \ ++ rm -f $(DESTDIR)$(helpdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -240,23 +216,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -270,10 +251,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) ++ + installdirs: +- for dir in "$(DESTDIR)$(helpdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(helpdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -293,7 +273,7 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -304,34 +284,24 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-helpDATA + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -350,21 +320,17 @@ + + ps-am: + +-uninstall-am: uninstall-helpDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-helpDATA uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-helpDATA \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-helpDATA ++ distdir dvi dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-helpDATA \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-helpDATA uninstall-info-am + + + %.htm: %.xml +diff -Nur sivp-0.5.0.orig/src/Makefile.in sivp-0.5.0/src/Makefile.in +--- sivp-0.5.0.orig/src/Makefile.in 2008-09-27 05:14:23.000000000 +0200 ++++ sivp-0.5.0/src/Makefile.in 2009-03-16 18:08:27.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.7.9 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,11 +14,16 @@ + + @SET_MAKE@ + ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. ++ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -30,32 +35,10 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = @build@ + host_triplet = @host@ +-subdir = src +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/Makefile.win.in $(srcdir)/builder.sce.in \ +- $(srcdir)/config.h.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +-CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = builder.sce Makefile.win +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(libsivpdir)" +-libsivpDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(libsivp_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -85,7 +68,6 @@ + FFLAGS = @FFLAGS@ + GREP = @GREP@ + HELPDIR = @HELPDIR@ +-INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -97,7 +79,6 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ + NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OPENCV_CFLAGS = @OPENCV_CFLAGS@ +@@ -121,14 +102,15 @@ + TOOLBOX_FUNCTIONS = @TOOLBOX_FUNCTIONS@ + TOOLBOX_TABLE = @TOOLBOX_TABLE@ + VERSION = @VERSION@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ ++am__isrc = @am__isrc@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ +@@ -139,7 +121,6 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ +-builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -170,68 +151,54 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ ++ + ALL_SRC = addframe.c avicloseall.c aviclose.c avifile.c aviinfo.c avilistopened.c aviopen.c avireadframe.c camopen.c camshift.c canny.c common.c cvtcolor.c detectforeground.c detectobjects.c filter2.c imabsdiff.c imadd.c imdivide.c imfilter.c imfinfo.c immultiply.c impyramid.c imread.c imresize.c imsubtract.c imwrite.c ind2rgb.c mat2utfimg.c meanshift.c sivp_init.c sobel.c test.c ++ + libsivpdir = @TOOLBOXDIR@/lib ++ + libsivp_DATA = libsivp.so + EXTRA_DIST = $(ALL_SRC) common.h ++subdir = src ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = builder.sce Makefile.win ++DIST_SOURCES = ++DATA = $(libsivp_DATA) ++ ++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Makefile.win.in \ ++ builder.sce.in config.h.in + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ ++ $(MAKE) stamp-h1; \ + else :; fi + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status src/config.h +-$(srcdir)/config.h.in: $(am__configure_deps) ++ ++$(srcdir)/config.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOHEADER) +- rm -f stamp-h1 +- touch $@ ++ touch $(srcdir)/config.h.in + + distclean-hdr: + -rm -f config.h stamp-h1 +-builder.sce: $(top_builddir)/config.status $(srcdir)/builder.sce.in ++builder.sce: $(top_builddir)/config.status builder.sce.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-Makefile.win: $(top_builddir)/config.status $(srcdir)/Makefile.win.in ++Makefile.win: $(top_builddir)/config.status Makefile.win.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + + mostlyclean-libtool: +@@ -239,22 +206,27 @@ + + clean-libtool: + -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++libsivpDATA_INSTALL = $(INSTALL_DATA) + install-libsivpDATA: $(libsivp_DATA) + @$(NORMAL_INSTALL) +- test -z "$(libsivpdir)" || $(MKDIR_P) "$(DESTDIR)$(libsivpdir)" ++ $(mkinstalldirs) $(DESTDIR)$(libsivpdir) + @list='$(libsivp_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(libsivpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsivpdir)/$$f'"; \ +- $(libsivpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsivpdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(libsivpDATA_INSTALL) $$d$$p $(DESTDIR)$(libsivpdir)/$$f"; \ ++ $(libsivpDATA_INSTALL) $$d$$p $(DESTDIR)$(libsivpdir)/$$f; \ + done + + uninstall-libsivpDATA: + @$(NORMAL_UNINSTALL) + @list='$(libsivp_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(libsivpdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libsivpdir)/$$f"; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(libsivpdir)/$$f"; \ ++ rm -f $(DESTDIR)$(libsivpdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -262,23 +234,28 @@ + ctags: CTAGS + CTAGS: + ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -292,10 +269,9 @@ + check-am: all-am + check: check-am + all-am: Makefile $(DATA) config.h ++ + installdirs: +- for dir in "$(DESTDIR)$(libsivpdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(libsivpdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -315,41 +291,35 @@ + clean-generic: + + distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ + clean-am: clean-generic clean-libtool mostlyclean-am + +-distclean-am: clean-am distclean-generic distclean-hdr ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool + + dvi: dvi-am + + dvi-am: + +-html: html-am +- + info: info-am + + info-am: + + install-data-am: install-libsivpDATA + +-install-dvi: install-dvi-am +- + install-exec-am: + +-install-html: install-html-am +- + install-info: install-info-am + + install-man: + +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -368,22 +338,17 @@ + + ps-am: + +-uninstall-am: uninstall-libsivpDATA +- +-.MAKE: install-am install-strip ++uninstall-am: uninstall-info-am uninstall-libsivpDATA + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-hdr distclean-libtool \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am \ +- install-libsivpDATA install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ ++ distdir dvi dvi-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-info \ ++ install-info-am install-libsivpDATA install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-libsivpDATA ++ uninstall-info-am uninstall-libsivpDATA + + + all: libsivp.so only in patch2: unchanged: --- sivp-0.5.0.orig/debian/patches/series +++ sivp-0.5.0/debian/patches/series @@ -0,0 +1 @@ +javaHeadless.diff