[qhull] 01/03: Imported Debian patch 3.1-5
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Thu Feb 6 14:03:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
bap pushed a commit to annotated tag debian/2002.1-2
in repository qhull.
commit 4b328cdb61551b1297720614f127f3e63432a979
Author: Barak Pearlmutter <bap at cs.unm.edu>
Date: Thu Apr 11 22:12:33 2002 -0600
Imported Debian patch 3.1-5
---
.cvsignore | 2 +
Makefile.prefix | 15 +++++++
debian/.cvsignore | 7 ++++
debian/README.Debian | 11 +++++
debian/TODO | 12 ++++++
debian/changelog | 31 ++++++++++++++
debian/control | 41 ++++++++++++++++++
debian/copyright | 67 +++++++++++++++++++++++++++++
debian/libqhull-dev.dirs | 2 +
debian/libqhull-dev.doc-base | 9 ++++
debian/libqhull-dev.docs | 4 ++
debian/libqhull-dev.files | 3 ++
debian/libqhull3.dirs | 1 +
debian/libqhull3.docs | 1 +
debian/libqhull3.files | 1 +
debian/qhull-bin.dirs | 1 +
debian/qhull-bin.docs | 1 +
debian/qhull-bin.files | 6 +++
debian/qhull-bin.manpages | 2 +
debian/qhull-bin.undocumented | 4 ++
debian/rules | 98 +++++++++++++++++++++++++++++++++++++++++++
debian/shlibs.local | 1 +
src/.cvsignore | 10 +++++
src/Makefile | 16 +++++++
src/Makefile.bins | 27 ++++++++++++
src/Makefile.libs.common | 21 ++++++++++
src/geom.c | 3 +-
src/liba/Makefile | 24 +++++++++++
src/libso/.cvsignore | 2 +
src/libso/Makefile | 38 +++++++++++++++++
src/qconvex.c | 2 -
src/qdelaun.c | 2 -
src/qhalf.c | 2 -
src/qhull.c | 3 ++
src/qhull.h | 2 +-
src/qvoronoi.c | 2 -
src/unix.c | 2 -
src/user_eg.c | 2 -
src/user_eg2.c | 2 -
39 files changed, 463 insertions(+), 17 deletions(-)
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..99ee691
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,2 @@
+build-stamp
+configure-stamp
diff --git a/Makefile.prefix b/Makefile.prefix
new file mode 100644
index 0000000..07ef225
--- /dev/null
+++ b/Makefile.prefix
@@ -0,0 +1,15 @@
+prefix=/usr/local
+exec_prefix=$(prefix)
+bindir=$(exec_prefix)/bin
+datadir=$(prefix)/share
+libdir=$(exec_prefix)/lib
+infodir=$(prefix)/info
+includedir=$(prefix)/include
+docdir=$(datadir)/doc
+
+INSTALL=install
+INSTALL_DATA=$(INSTALL) --mode 644
+INSTALL_PROGRAM=$(INSTALL)
+
+install-strip:
+ $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) --strip' install
diff --git a/debian/.cvsignore b/debian/.cvsignore
new file mode 100644
index 0000000..7c21e54
--- /dev/null
+++ b/debian/.cvsignore
@@ -0,0 +1,7 @@
+*.debhelper
+files
+*.substvars
+tmp
+libqhull-dev
+libqhull3
+qhull-bin
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..56af8ed
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,11 @@
+qhull for Debian
+----------------
+
+The library's functionality can be accessed from the command line
+using the executable "qhull". Random distributions of points can be
+drawn for testing and experimentation using "rbox".
+
+These executables are so small that they didn't seem worth their own
+package, so I just put them in with the library.
+
+ -- Barak Pearlmutter <bap at cs.unm.edu>, Sun, 24 Mar 2002 21:53:13 -0700
diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..c2f0724
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,12 @@
+The random number generator in src/geom2.c makes me suspicious.
+Maybe it would be better to switch to random(3).
+
+The include files used in user code have lots of stuff in them that
+really only the library needs. These could be split out.
+
+Hook into that debian library-switches gizmo.
+
+Separate versions of all functions for various floating point
+precisions. Perhaps via multiple #include's.
+
+Convert executables to getopt and --help, and stop using isatty.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..4e0f1b1
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,31 @@
+qhull (3.1-5) unstable; urgency=low
+
+ * rephrase descriptions (closes: #141027)
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Thu, 11 Apr 2002 22:12:33 -0600
+
+qhull (3.1-4) unstable; urgency=low
+
+ * include executables qconvex, qhalf, qvoronoi, qdelaunay
+ * break executables out into separate package qhull-bin
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Wed, 27 Mar 2002 20:26:44 -0700
+
+qhull (3.1-3) unstable; urgency=low
+
+ * rename executable qhull-rbox back to rbox
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Mon, 25 Mar 2002 09:13:57 -0700
+
+qhull (3.1-2) unstable; urgency=low
+
+ * src/qconvex.c did not belong in the library
+ * qh_version was multiply defined, now defined only in qhull.c
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Mon, 25 Mar 2002 08:55:45 -0700
+
+qhull (3.1-1) unstable; urgency=low
+
+ * Initial Release. (closes: #108115)
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Sun, 24 Mar 2002 21:53:13 -0700
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..ec31daf
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,41 @@
+Source: qhull
+Priority: optional
+Maintainer: Barak Pearlmutter <bap at cs.unm.edu>
+Build-Depends: debhelper (>> 3.0.0)
+Standards-Version: 3.5.2
+
+Package: libqhull-dev
+Section: devel
+Architecture: any
+Depends: libqhull3 (= ${Source-Version}), libc6-dev
+Description: Library for calculating convex hulls and related structures
+ This library (development files) implements a practical convex hull
+ algorithm that combines the two-dimensional Quickhull Algorithm with
+ the general dimension Beneath-Beyond Algorithm. This algorithm is
+ robust against floating point errors, often a problem for less
+ sophisticated computational geometry algorithms. The library also
+ performs related computations, such as Delaunay triangulation.
+
+Package: libqhull3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Library for calculating convex hulls and related structures
+ This library (runtime files) implements a practical convex hull
+ algorithm that combines the two-dimensional Quickhull Algorithm with
+ the general dimension Beneath-Beyond Algorithm. This algorithm is
+ robust against floating point errors, often a problem for less
+ sophisticated computational geometry algorithms. The library also
+ performs related computations, such as Delaunay triangulation.
+
+Package: qhull-bin
+Section: math
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Calculate convex hulls and related structures
+ These executables use a practical convex hull algorithm that combines
+ the two-dimensional Quickhull Algorithm with the general dimension
+ Beneath-Beyond Algorithm. This algorithm is robust against floating
+ point errors, often a problem for less sophisticated computational
+ geometry algorithms. There are also programs that perform related
+ computations, such as Delaunay triangulation.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..5c8f5c5
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,67 @@
+This package was debianized by Barak Pearlmutter <bap at cs.unm.edu> on
+Sun, 24 Mar 2002 21:53:13 -0700.
+
+It was downloaded from
+
+ http://www.geom.umn.edu/locate/qhull
+ http://www.geom.umn.edu/software/qhull/qhull3.1.tgz
+
+Upstream Authors:
+
+ C. Bradford Barber <bradb at geom.umn.edu>
+ Hannu Huhdanpaa <hannu at geom.umn.edu>
+
+ c/o The Geometry Center
+ University of Minnesota
+ 400 Lind Hall
+ 207 Church Street S.E.
+ Minneapolis, MN 55455
+
+Copyright:
+
+ In addition to the formal license, the authors ask a favor in
+ http://www.geom.umn.edu/~bradb/qhull-news.html
+
+ If you find Qhull helpful, please let me know about your
+ application. Send e-mail to bradb at geom.umn.edu and I'll add you
+ to the list below. If you publish a paper that mentions Qhull,
+ please send a reference and abstract.
+
+ The formal license is in the source file COPYING.txt
+
+ Qhull, Copyright (c) 1993-2001
+
+ The National Science and Technology Research Center for
+ Computation and Visualization of Geometric Structures
+ (The Geometry Center)
+ University of Minnesota
+ 400 Lind Hall
+ 207 Church Street S.E.
+ Minneapolis, MN 55455 USA
+
+ email: qhull at geom.umn.edu
+
+ This software includes Qhull from The Geometry Center. Qhull is
+ copyrighted as noted above. Qhull is free software and may be obtained
+ via anonymous ftp from geom.umn.edu. It may be freely copied, modified,
+ and redistributed under the following conditions:
+
+ 1. All copyright notices must remain intact in all files.
+
+ 2. A copy of this text file must be distributed along with any copies
+ of Qhull that you redistribute; this includes copies that you have
+ modified, or copies of programs or other software products that
+ include Qhull.
+
+ 3. If you modify Qhull, you must include a notice giving the
+ name of the person performing the modification, the date of
+ modification, and the reason for such modification.
+
+ 4. When distributing modified versions of Qhull, or other software
+ products that include Qhull, you must provide notice that the original
+ source code may be obtained as noted above.
+
+ 5. There is no warranty or other guarantee of fitness for Qhull, it is
+ provided solely "as is". Bug reports or fixes may be sent to
+ qhull_bug at geom.umn.edu; the authors may or may not act on them as
+ they desire.
diff --git a/debian/libqhull-dev.dirs b/debian/libqhull-dev.dirs
new file mode 100644
index 0000000..4418816
--- /dev/null
+++ b/debian/libqhull-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
diff --git a/debian/libqhull-dev.doc-base b/debian/libqhull-dev.doc-base
new file mode 100644
index 0000000..7f697d7
--- /dev/null
+++ b/debian/libqhull-dev.doc-base
@@ -0,0 +1,9 @@
+Document: libqhull
+Title: Debian QHULL Manual
+Author: Brad Barber <qhull at geom.umn.edu>
+Abstract: This manual describes the qhull convex hull library
+Section: devel
+
+Format: HTML
+Index: /usr/share/doc/libqhull-dev/html/index.htm
+Files: /usr/share/doc/libqhull-dev/html/*.htm
diff --git a/debian/libqhull-dev.docs b/debian/libqhull-dev.docs
new file mode 100644
index 0000000..fc9dd40
--- /dev/null
+++ b/debian/libqhull-dev.docs
@@ -0,0 +1,4 @@
+Announce.txt
+README.txt
+REGISTER.txt
+debian/tmp/usr/doc/html
diff --git a/debian/libqhull-dev.files b/debian/libqhull-dev.files
new file mode 100644
index 0000000..d1bffed
--- /dev/null
+++ b/debian/libqhull-dev.files
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
diff --git a/debian/libqhull3.dirs b/debian/libqhull3.dirs
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/libqhull3.dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/libqhull3.docs b/debian/libqhull3.docs
new file mode 100644
index 0000000..ba1f813
--- /dev/null
+++ b/debian/libqhull3.docs
@@ -0,0 +1 @@
+REGISTER.txt
diff --git a/debian/libqhull3.files b/debian/libqhull3.files
new file mode 100644
index 0000000..d0dbfd1
--- /dev/null
+++ b/debian/libqhull3.files
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
diff --git a/debian/qhull-bin.dirs b/debian/qhull-bin.dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/qhull-bin.dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/qhull-bin.docs b/debian/qhull-bin.docs
new file mode 100644
index 0000000..ba1f813
--- /dev/null
+++ b/debian/qhull-bin.docs
@@ -0,0 +1 @@
+REGISTER.txt
diff --git a/debian/qhull-bin.files b/debian/qhull-bin.files
new file mode 100644
index 0000000..c0fabda
--- /dev/null
+++ b/debian/qhull-bin.files
@@ -0,0 +1,6 @@
+usr/bin/qhull
+usr/bin/rbox
+usr/bin/qconvex
+usr/bin/qhalf
+usr/bin/qvoronoi
+usr/bin/qdelaunay
diff --git a/debian/qhull-bin.manpages b/debian/qhull-bin.manpages
new file mode 100644
index 0000000..cf5bbea
--- /dev/null
+++ b/debian/qhull-bin.manpages
@@ -0,0 +1,2 @@
+html/qhull.man
+html/rbox.man
diff --git a/debian/qhull-bin.undocumented b/debian/qhull-bin.undocumented
new file mode 100644
index 0000000..6f3be2e
--- /dev/null
+++ b/debian/qhull-bin.undocumented
@@ -0,0 +1,4 @@
+qconvex.1
+qdelaunay.1
+qhalf.1
+qvoronoi.1
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..0310d55
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,98 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=3
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ # Add here commands to compile the package.
+ $(MAKE) -Csrc prefix=/usr
+ touch build-stamp
+
+clean:
+ dh_testdir
+ rm -f build-stamp configure-stamp
+ # Add here commands to clean up after the build process.
+ -$(MAKE) -Csrc clean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_clean -k
+ dh_installdirs
+ # Add here commands to install the package into debian/tmp
+ $(MAKE) -Csrc install DESTDIR=$(CURDIR)/debian/tmp prefix=/usr
+ -mkdir -p debian/tmp/usr/doc/html
+ cp -a html/*.htm html/*.gif debian/tmp/usr/doc/html/
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_movefiles
+# dh_installdebconf
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+ dh_installcron
+ dh_installman
+ dh_installinfo
+ dh_undocumented
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/shlibs.local b/debian/shlibs.local
new file mode 100644
index 0000000..64a3c72
--- /dev/null
+++ b/debian/shlibs.local
@@ -0,0 +1 @@
+libqhull 3 libqhull3
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..a26b609
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,10 @@
+qconvex
+qdelaun
+qdelaunay
+qhalf
+qhull
+qvoronoi
+rbox
+unix
+user_eg
+user_eg2
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..d877e34
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,16 @@
+all::
+
+include ../Makefile.prefix
+
+all install clean uninstall::
+ $(MAKE) -C liba $@
+ $(MAKE) -C libso $@
+ $(MAKE) -f Makefile.bins $@
+
+hsrc = geom.h io.h mem.h merge.h poly.h qhull.h qhull_a.h qset.h stat.h user.h
+
+install::
+ -install --directory $(DESTDIR)$(includedir)/qhull
+ $(INSTALL_DATA) $(hsrc) $(DESTDIR)$(includedir)/qhull/
+
+.PHONY: all install install-strip clean uninstall
diff --git a/src/Makefile.bins b/src/Makefile.bins
new file mode 100644
index 0000000..31e568a
--- /dev/null
+++ b/src/Makefile.bins
@@ -0,0 +1,27 @@
+# -*- makefile -*-
+
+psrc = qconvex.c qhalf.c qvoronoi.c rbox.c user_eg.c user_eg2.c
+bins = $(psrc:.c=) qhull qdelaunay
+
+all: $(bins)
+
+CFLAGS += -Wall -O2 -g
+LOADLIBES += -lqhull
+LDFLAGS += -Llibso
+
+qhull: unix
+ cp -a unix qhull
+
+qdelaunay: qdelaun
+ cp -a qdelaun qdelaunay
+
+include ../Makefile.prefix
+
+install: $(bins)
+ -install --directory $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) $(bins) $(DESTDIR)$(bindir)
+
+clean:
+ -rm -f $(bins) unix
+
+.PHONY: all install install-strip clean uninstall
diff --git a/src/Makefile.libs.common b/src/Makefile.libs.common
new file mode 100644
index 0000000..8114f32
--- /dev/null
+++ b/src/Makefile.libs.common
@@ -0,0 +1,21 @@
+cfiles = user.c global.c stat.c io.c geom2.c poly2.c merge.c \
+ qhull.c geom.c poly.c qset.c mem.c
+
+ofiles = $(cfiles:.c=.o)
+
+CFLAGS += -g -O2 -Wall
+CPPFLAGS += -I..
+LOADLIBES += -lm
+
+clean::
+ -rm -f $(ofiles)
+
+.PHONY: all install install-strip uninstall clean
+
+# automatically account for #include dependencies
+override CPPFLAGS+=-MMD
+dfiles = $(notdir $(patsubst %.o, %.d, $(ofiles)))
+-include $(dfiles)
+
+clean::
+ -rm -f $(dfiles)
diff --git a/src/geom.c b/src/geom.c
index f25d171..e6eec17 100644
--- a/src/geom.c
+++ b/src/geom.c
@@ -139,7 +139,6 @@ facetT *qh_findbest (pointT *point, facetT *startfacet,
realT *dist, boolT *isoutside, int *numpart) {
realT bestdist= -REALmax/2 /* avoid underflow */;
facetT *facet, *neighbor, **neighborp, *bestfacet= NULL;
- facetT *bestfacet_all= startfacet;
int oldtrace= qh IStracing;
unsigned int visitid= ++qh visit_id;
int numpartnew=0;
@@ -409,7 +408,7 @@ facetT *qh_findbesthorizon (boolT ischeckmax, pointT* point, facetT *startfacet,
*/
facetT *qh_findbestnew (pointT *point, facetT *startfacet,
realT *dist, boolT bestoutside, boolT *isoutside, int *numpart) {
- realT bestdist= -REALmax/2, minsearch= -REALmax/2;
+ realT bestdist= -REALmax/2;
facetT *bestfacet= NULL, *facet;
int oldtrace= qh IStracing, i;
unsigned int visitid= ++qh visit_id;
diff --git a/src/liba/Makefile b/src/liba/Makefile
new file mode 100644
index 0000000..d9ebe74
--- /dev/null
+++ b/src/liba/Makefile
@@ -0,0 +1,24 @@
+l=qhull
+
+all: lib$(l).a
+
+VPATH=..
+
+include ../../Makefile.prefix
+include ../Makefile.libs.common
+
+lib$(l).a: lib$(l).a($(ofiles))
+ -ranlib $@
+
+clean::
+ -rm -f lib$(l).a
+
+install: lib$(l).a
+ -install --directory $(DESTDIR)$(libdir)
+ $(INSTALL_DATA) lib$(l).a $(DESTDIR)$(libdir)/
+
+uninstall:
+ -rm -f $(DESTDIR)$(libdir)/lib$(l).a
+
+.SECONDARY: $(ofiles) # don't delete intermediate .o files
+#.INTERMEDIATE: $(ofiles) # delete intermediate .o files
diff --git a/src/libso/.cvsignore b/src/libso/.cvsignore
new file mode 100644
index 0000000..b45d4b8
--- /dev/null
+++ b/src/libso/.cvsignore
@@ -0,0 +1,2 @@
+lib*.so
+lib*.so.*
diff --git a/src/libso/Makefile b/src/libso/Makefile
new file mode 100644
index 0000000..2a841f7
--- /dev/null
+++ b/src/libso/Makefile
@@ -0,0 +1,38 @@
+l=qhull
+
+major=3
+minor=1
+
+shlib=lib$(l).so.$(major).$(minor)
+
+all: $(shlib) lib$(l).so.$(major) lib$(l).so
+
+VPATH=..
+
+include ../../Makefile.prefix
+include ../Makefile.libs.common
+
+# See the Linux GCC HOWTO section 6.4.2.2, "ELF shared libraries"
+
+CFLAGS += -fPIC
+LDFLAGS += --shared -Wl,-soname=lib$(l).so.$(major) -s
+
+$(shlib): $(ofiles)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES)
+
+lib$(l).so.$(major):
+ ln -sf $(shlib) lib$(l).so.$(major)
+
+lib$(l).so:
+ ln -sf lib$(l).so.$(major) lib$(l).so
+
+clean::
+ -rm -f lib$(l).so{.$(major){.$(minor),},}
+
+install: $(shlib) lib$(l).so.$(major) lib$(l).so
+ -install --directory $(DESTDIR)$(libdir)
+ $(INSTALL_DATA) $(shlib) $(DESTDIR)$(libdir)/
+ cp -af lib$(l).so{.$(major),} $(DESTDIR)$(libdir)/
+
+uninstall:
+ -rm -f $(DESTDIR)$(libdir)/lib$(l).so{.$(major){,.$(minor)},}
diff --git a/src/qconvex.c b/src/qconvex.c
index 5e2af72..ad1200c 100644
--- a/src/qconvex.c
+++ b/src/qconvex.c
@@ -51,8 +51,6 @@ int isatty (int); /* returns 1 if stdin is a tty
concise prompt below
*/
-char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
-
/* duplicated in qconvex.htm */
char hidden_options[]=" d v H Qbb Qf Qg Qm Qr Qu Qv Qx Qz TR E V Fp Gt Q0 Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 ";
diff --git a/src/qdelaun.c b/src/qdelaun.c
index eaac01c..95f5255 100644
--- a/src/qdelaun.c
+++ b/src/qdelaun.c
@@ -52,8 +52,6 @@ int isatty (int); /* returns 1 if stdin is a tty
concise prompt below
*/
-char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
-
/* duplicated in qdelau_f.htm and qdelaun.htm */
char hidden_options[]=" d n v H U Qb QB Qc Qf Qg Qi Qm Qr QR Qv Qx TR E V FC Fi Fo Ft Fp FV Q0 Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 ";
diff --git a/src/qhalf.c b/src/qhalf.c
index 56c34a6..e31d0af 100644
--- a/src/qhalf.c
+++ b/src/qhalf.c
@@ -51,8 +51,6 @@ int isatty (int); /* returns 1 if stdin is a tty
concise prompt below
*/
-char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
-
/* duplicated in qhalf.htm */
char hidden_options[]=" d n v Qbb QbB Qf Qg Qm Qr QR Qv Qx Qz TR E V Fa FA FC FD FS Ft FV Gt Q0 Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 ";
diff --git a/src/qhull.c b/src/qhull.c
index eba31f0..99780c3 100644
--- a/src/qhull.c
+++ b/src/qhull.c
@@ -54,6 +54,9 @@
error if temporary sets exist
record end time
*/
+
+char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
+
void qh_qhull (void) {
int numoutside;
diff --git a/src/qhull.h b/src/qhull.h
index 54eb22f..27fcaee 100644
--- a/src/qhull.h
+++ b/src/qhull.h
@@ -362,7 +362,7 @@ struct vertexT {
/*======= -global variables -qh ============================*/
-extern char qh_version[]; /* defined in unix.c etc. */
+extern char qh_version[];
/*-<a href="qh-globa.htm#TOC"
>--------------------------------</a><a name="qh">-</a>
diff --git a/src/qvoronoi.c b/src/qvoronoi.c
index 05706aa..4176888 100644
--- a/src/qvoronoi.c
+++ b/src/qvoronoi.c
@@ -52,8 +52,6 @@ int isatty (int); /* returns 1 if stdin is a tty
concise prompt below
*/
-char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
-
/* duplicated in qvoron_f.htm and qvoronoi.htm */
char hidden_options[]=" d n m v H U Qb QB Qc Qf Qg Qi Qm Qr QR Qv Qx TR E V Fa FA FC Fp FS Ft FV Pv Gt Q0 Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 ";
diff --git a/src/unix.c b/src/unix.c
index 654e213..cee8f29 100644
--- a/src/unix.c
+++ b/src/unix.c
@@ -51,8 +51,6 @@ int isatty (int); /* returns 1 if stdin is a tty
recompile user_eg.c, rbox.c, qhull.c, qconvex.c, qdelaun.c qvoronoi.c, qhalf.c
*/
-char qh_version[]= "version 3.1 2001/10/04";
-
/*-<a href="qh-qhull.htm#TOC"
>-------------------------------</a><a name="prompt">-</a>
diff --git a/src/user_eg.c b/src/user_eg.c
index 2e4200e..97e4aa7 100644
--- a/src/user_eg.c
+++ b/src/user_eg.c
@@ -47,8 +47,6 @@
#include "qhull_a.h"
-char qh_version[] = "user_eg 3.1 2001/10/04"; /* used for error messages */
-
/*-------------------------------------------------
-internal function prototypes
*/
diff --git a/src/user_eg2.c b/src/user_eg2.c
index 3543358..1eb42cc 100644
--- a/src/user_eg2.c
+++ b/src/user_eg2.c
@@ -51,8 +51,6 @@
#include "qhull_a.h"
-char qh_version[] = "user_eg2 3.1 2001/10/04"; /* used for error messages */
-
/*-------------------------------------------------
-internal function prototypes
*/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qhull.git
More information about the debian-science-commits
mailing list