From 8387b7ddbc61e88220b3efb5f5dad4662365a881 Mon Sep 17 00:00:00 2001
From: Brad Barber <bradb@shore.net>
Date: Sat, 9 Jan 2010 20:36:47 -0500
Subject: [PATCH] Update files for config/Makefile-am* - config was not tested.
Add random.h to libqhull.pro
---
config/Makefile-am-eg | 4 +++-
config/Makefile-am-html | 2 +-
config/Makefile-am-main | 1 +
config/Makefile-am-src | 13 +++++++++----
config/configure.ac | 2 +-
project/libqhull/libqhull.pro | 2 +-
src/Changes.txt | 10 +++++-----
7 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/config/Makefile-am-eg b/config/Makefile-am-eg
index 515e370..14af0be 100644
--- a/config/Makefile-am-eg
+++ b/config/Makefile-am-eg
@@ -13,8 +13,10 @@ examples_DATA = \
q_eg \
q_egtest \
q_test \
+ q_test-ok.txt \
+ q_test.bat \
Qhull-go.bat \
- q_test.bat
+ qhulltest-ok.txt
### Extra files to be included in the tarball
diff --git a/config/Makefile-am-html b/config/Makefile-am-html
index 0da6a3f..c2a924e 100644
--- a/config/Makefile-am-html
+++ b/config/Makefile-am-html
@@ -27,11 +27,11 @@ html_DATA = \
qh--geom.gif \
qh--half.gif \
qh--rand.gif \
+ qh-code.htm \
qh-eg.htm \
qh-faq.htm \
qh-get.htm \
qh-impre.htm \
- qh-in.htm \
qh-optc.htm \
qh-optf.htm \
qh-optg.htm \
diff --git a/config/Makefile-am-main b/config/Makefile-am-main
index a33d7f0..8164d29 100644
--- a/config/Makefile-am-main
+++ b/config/Makefile-am-main
@@ -19,6 +19,7 @@ doc_DATA = \
EXTRA_DIST = \
$(doc_DATA) \
+ CMakeLists.txt \
File_id.diz \
QHULL-GO.pif
diff --git a/config/Makefile-am-src b/config/Makefile-am-src
index 47d8dcd..e75b43c 100644
--- a/config/Makefile-am-src
+++ b/config/Makefile-am-src
@@ -9,6 +9,7 @@ lib_LTLIBRARIES = libqhull.la
# from:
libqhull_la_SOURCES = \
+ rboxlib.c \
user.c \
global.c \
stat.c \
@@ -16,11 +17,14 @@ libqhull_la_SOURCES = \
geom2.c \
poly2.c \
merge.c \
- qhull.c \
+ libqhull.c \
geom.c \
poly.c \
qset.c \
- mem.c
+ mem.c \
+ usermem.c \
+ userprintf.c \
+ random.c
# how:
libqhull_la_LDFLAGS = -version-info 5:0:0 -lm
@@ -56,7 +60,8 @@ pkginclude_HEADERS = \
stat.h \
io.h \
merge.h \
- qhull.h \
+ libqhull.h \
+ random.h \
qset.h \
user.h
@@ -71,7 +76,7 @@ examplesdir = $(docdir)/examples
examples_DATA = \
user_eg.c \
user_eg2.c \
- qhull_interface.cpp \
+ CMakeLists.txt \
Makefile.txt \
Mborland
diff --git a/config/configure.ac b/config/configure.ac
index 9672688..d80b7a6 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -3,7 +3,7 @@ dnl Author: Rafael Laboissiere <rafael@debian.org>
dnl Created: Mon Dec 3 21:36:21 CET 2001
AC_INIT(qhull, 2009.1)
-AC_CONFIG_SRCDIR(src/qhull.c)
+AC_CONFIG_SRCDIR(src/libqhull.c)
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(config)
diff --git a/project/libqhull/libqhull.pro b/project/libqhull/libqhull.pro
index ffe6959..5824ccd 100644
--- a/project/libqhull/libqhull.pro
+++ b/project/libqhull/libqhull.pro
@@ -98,9 +98,9 @@ HEADERS += src/libqhull.h
HEADERS += src/mem.h
HEADERS += src/merge.h
HEADERS += src/poly.h
+HEADERS += src/random.h
# qhull.h is for backwards compatibility
HEADERS += src/qhull_a.h
HEADERS += src/qset.h
-HEADERS += src/random.h
HEADERS += src/stat.h
HEADERS += src/user.h
diff --git a/src/Changes.txt b/src/Changes.txt
index a82a038..3c72e94 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -76,8 +76,8 @@ To do
- qhulltest --all added to output
- Add test of user_eg3, etc.
- Check for wraparound of 64-bit ints -- e.g., a large set or points
- - Add config directory to Qhull
- Add md5sum
+ - Set up globals for thread-private storage
- Generate vcproj from qtpro files
cd qtpro && qmake -spec win32-msvc2005 -tp vc -recursive
sed -i 's/C\:\/bash\/local\/qhull\/qtpro\///' qhull-all.sln
@@ -96,11 +96,12 @@ To do
- get copy of unused
Need help
- - Set up debian build.
+ - Set up debian build.
+ Please keep debian files in config/ and project/debian/
Branch 'debian' is from http://savannah.nongnu.org/cvs/?group=qhull
- Please keep files in config/ or project/debian/
- project/debian needs updating for its new location (two levels down)
+ project/debian needs updating for its new location. It was at qhull's level.
- Add CMakeLists.txt for qhullcpp, user_eg3, cpp/, and cpp/road
+ If practical, please move to project/
- The C++ interface needs work. Give it a try and make it better.
- Verify -fno-strict-aliasing needed for gcc 4.1, 4.2, and 4.3 (qset segfault)
@@ -281,7 +282,6 @@ Changes to C code for C++ support
Documentation:
- Fixed out-of-date CiteSeer references
- Renamed html/qh-in.htm to html/qh-code.htm
- - Renamed qh-in.htm to qh-code.htm
- Add reference to 'Qt' to 'i'
- Add reference to 'FS' to 'FA'
- qh-impre.htm discusses precision issues for halfspace intersection
--
GitLab