sci-astronomy/astrometry: Version bump. Rewrote the patches

Package-Manager: portage-2.2.01.22013-prefix RepoMan-Options: --force
author: Sébastien Fabbro <bicatali@gentoo.org> 2013-06-13 17:41:38 -0700
committer: Sébastien Fabbro <bicatali@gentoo.org> 2013-06-13 17:41:38 -0700
commit: 2854e529e9fe64dd648fdb3a16e2ebe2d6aa231e (patch)
tree: 75e8be0a78f907cb4a09cf304590c2b6488360d4 /sci-astronomy/astrometry
parent: manifests fixes (diff)
download: sci-2854e529e9fe64dd648fdb3a16e2ebe2d6aa231e.tar.gz
sci-2854e529e9fe64dd648fdb3a16e2ebe2d6aa231e.tar.bz2
sci-2854e529e9fe64dd648fdb3a16e2ebe2d6aa231e.zip
13 files changed, 1157 insertions, 855 deletions
diff --git a/sci-astronomy/astrometry/ChangeLog b/sci-astronomy/astrometry/ChangeLog
index f0751a374..e5b4ff94e 100644
--- a/sci-astronomy/astrometry/ChangeLog
+++ b/sci-astronomy/astrometry/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*astrometry-0.43 (14 Jun 2013)
+
+  14 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +astrometry-0.43.ebuild,
+  +files/0.43-as-needed.patch, +files/0.43-respect-user-flags.patch,
+  +files/0.43-system-libs.patch, -astrometry-0.38.ebuild,
+  -files/0.38-array-bounds.patch, -files/0.38-as-needed.patch,
+  -files/0.38-missing-headers.patch, -files/0.38-respect-user-flags.patch,
+  -files/0.38-strict-aliasing.patch, -files/0.38-system-libs.patch,
+  metadata.xml:
+  sci-astronomy/astrometry: Version bump. Rewrote the patches
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> astrometry-0.38.ebuild,
   metadata.xml:
   Clean wrong space and blank lines
@@ -14,4 +25,3 @@
   +files/0.38-strict-aliasing.patch, +files/0.38-system-libs.patch,
   +metadata.xml:
   sci-astronomy/astrometry: Initial import
-
diff --git a/sci-astronomy/astrometry/Manifest b/sci-astronomy/astrometry/Manifest
index cf5c75133..6fd1f7d56 100644
--- a/sci-astronomy/astrometry/Manifest
+++ b/sci-astronomy/astrometry/Manifest
@@ -1,2 +1 @@
-DIST astrometry.net-0.38.tar.bz2 4686209 SHA256 dd789637c5c6d2317097cbe1dd7e31e92c5383d984ba2ff2bd49ab1172181c28 SHA512 98172d5ebbf52140826411abe6da3f4739d455decdc876af754d07f477d17af1ab2cda62701f804e45239798b96fbe07b5d1c87ff491a88327c48019acb90c14 WHIRLPOOL 7d4f3f5a0d3553feef542b91812c39f51876928a0f687d8ec5b9c22bda51cae03afec07d91770909ffc1f14f0ec9174b7e9a518c619fb2674846fa44892edda2
 DIST astrometry.net-0.43.tar.bz2 6249755 SHA256 a9684be84e4e002188f6ba75d7dea7dbc28da9e3791e9fc774e9b9ae899dba92 SHA512 ae85912264ef0ebd6df110dd31c2c8efbfc34f3cc958ed4518ab715618be075495253d724e245011cdb1474333cdc9a73a6f3f0e74b85ca30c035dcf98f18502 WHIRLPOOL 22bd178582a8486e38073926a68d95429df1c4318b0cab57f3fb975912b91df0d5eb74a8a2c14cc13e2ea61de58018547f885e54f3e84ea2236c79ac8222dbd3
diff --git a/sci-astronomy/astrometry/astrometry-0.38.ebuild b/sci-astronomy/astrometry/astrometry-0.38.ebuild
deleted file mode 100644
index 97ce21611..000000000
--- a/sci-astronomy/astrometry/astrometry-0.38.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils
-
-MYP=${PN}.net-${PV}
-
-DESCRIPTION="Automated astrometric calibration programs and service"
-HOMEPAGE="http://astrometry.net/"
-SRC_URI="${HOMEPAGE}/downloads/${MYP}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy
-	media-libs/libpng
-	media-libs/netpbm
-	sci-astronomy/wcslib
-	sci-libs/cfitsio
-	sci-libs/gsl
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/cairo"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-as-needed.patch \
-		"${FILESDIR}"/${PV}-system-libs.patch \
-		"${FILESDIR}"/${PV}-missing-headers.patch \
-		"${FILESDIR}"/${PV}-strict-aliasing.patch \
-		"${FILESDIR}"/${PV}-respect-user-flags.patch \
-		"${FILESDIR}"/${PV}-array-bounds.patch
-}
-
-src_compile() {
-	emake
-	emake extra
-}
-
-src_install() {
-	emake install INSTALL_DIR="${ED}"/usr/astrometry
-	# TODO
-	# remove license file
-	# system pyfits?
-	# some execs are already included in cfitsio (system-libs patch need work)
-	# doc/examples in proper directory
-	# tests
-}
diff --git a/sci-astronomy/astrometry/astrometry-0.43.ebuild b/sci-astronomy/astrometry/astrometry-0.43.ebuild
new file mode 100644
index 000000000..0daa26a5b
--- /dev/null
+++ b/sci-astronomy/astrometry/astrometry-0.43.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MYP=${PN}.net-${PV}
+
+DESCRIPTION="Automated astrometric calibration programs and service"
+HOMEPAGE="http://astrometry.net/"
+SRC_URI="${HOMEPAGE}/downloads/${MYP}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/numpy
+	media-libs/libpng
+	media-libs/netpbm
+	sci-astronomy/wcslib
+	sci-libs/cfitsio
+	sci-libs/gsl
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/pyfits
+	x11-libs/cairo"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/0.43-as-needed.patch \
+		"${FILESDIR}"/0.43-respect-user-flags.patch \
+		"${FILESDIR}"/0.43-system-libs.patch
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		RANLIB=$(tc-getRANLIB) \
+		AR=$(tc-getAR)
+	emake \
+		CC=$(tc-getCC) \
+		RANLIB=$(tc-getRANLIB) \
+		AR=$(tc-getAR) \
+		extra
+}
+
+src_install() {
+	export INSTALL_DIR="${ED}"/usr/astrometry
+	emake install
+	# remove cfitsio duplicates
+	rm ${INSTALL_DIR}/bin/{fitscopy,imcopy,listhead} || die
+
+	# remove license file
+	rm ${INSTALL_DIR}/doc/LICENSE || die
+	dodoc ${INSTALL_DIR}/doc/*
+	rm -r ${INSTALL_DIR}/doc || die
+	if use examples; then
+		mv ${INSTALL_DIR}/examples ${ED}/usr/share/doc/${PF} || die
+	else
+		rm -r ${INSTALL_DIR}/examples
+	fi
+}
diff --git a/sci-astronomy/astrometry/files/0.38-array-bounds.patch b/sci-astronomy/astrometry/files/0.38-array-bounds.patch
deleted file mode 100644
index 3e2466677..000000000
--- a/sci-astronomy/astrometry/files/0.38-array-bounds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- astrometry.net-0.38.orig/blind/image2xy-files.c	2009-10-14 18:45:19.000000000 +0100
-+++ astrometry.net-0.38/blind/image2xy-files.c	2012-05-09 23:31:57.000000000 +0100
-@@ -45,7 +45,7 @@
- 	fitsfile *ofptr = NULL;
- 	int status = 0; // FIXME should have ostatus too
- 	int naxis;
--	long naxisn[2];
-+	long naxisn[3];
- 	int kk;
- 	int nhdus, hdutype, nimgs;
-     char* str;
diff --git a/sci-astronomy/astrometry/files/0.38-as-needed.patch b/sci-astronomy/astrometry/files/0.38-as-needed.patch
deleted file mode 100644
index 5fc97a7cd..000000000
--- a/sci-astronomy/astrometry/files/0.38-as-needed.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-diff -Nur astrometry.net-0.38.orig/blind/Makefile astrometry.net-0.38/blind/Makefile
---- astrometry.net-0.38.orig/blind/Makefile	2010-11-24 20:18:39.000000000 +0000
-+++ astrometry.net-0.38/blind/Makefile	2012-05-09 19:13:29.000000000 +0100
-@@ -50,7 +50,7 @@
- endif
- 
- LDFLAGS := $(LDFLAGS_DEF)
--LDFLAGS += -lm
-+LIBM = -lm
- LDFLAGS += -fPIC
- 
- CFLAGS += $(CFLAGS_DEF)
-@@ -132,7 +132,7 @@
- 
- $(BACKEND_SO): $(BACKEND_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
- 		$(QFITS_LIB) $(GSL_LIB)
--	$(CC) $(SHAREDLIBFLAGS) -o $@ $^
-+	$(CC) $(SHAREDLIBFLAGS) $^ -o $@
- 
- # old and miscellaneous executables that aren't part of the pipeline.
- OLDEXECS := plotquads rawstartree checkquads
-@@ -230,9 +230,9 @@
- 	done
- 
- test-solver: test-solver.o solver_test.o blind_wcs.o verify.o matchfile.o \
--		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
-+		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) $(LIBM)
- test-solver-2: test-solver-2.o solver_test_2.o blind_wcs.o verify.o matchfile.o quad-utils.o codefile.o \
--		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
-+		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) $(LIBM)
- 
- NODEP_OBJS += solver_test.o solver_test_2.o
- ALL_OBJ += test-solver.o test-solver-2.o
-@@ -240,14 +240,14 @@
- CFLAGS_DEBUG = $(subst -DNDEBUG,,$(CFLAGS))
- 
- test-solver.o: test-solver.c
--	$(CC) $(CFLAGS_DEBUG) -o $@ -c $<
-+	$(CC) $(CFLAGS_DEBUG) -c $< -o $@
- test-solver-2.o: test-solver-2.c
--	$(CC) $(CFLAGS_DEBUG) -o $@ -c $<
-+	$(CC) $(CFLAGS_DEBUG) -c $< -o $@
- 
- solver_test.o: solver.c
--	$(CC) $(CFLAGS_DEBUG) -DTESTING=1 -DTESTING_TRYALLCODES=1 -o $@ -c $<
-+	$(CC) $(CFLAGS_DEBUG) -DTESTING=1 -DTESTING_TRYALLCODES=1 -c $< -o $@
- solver_test_2.o: solver.c
--	$(CC) $(CFLAGS_DEBUG) -DTESTING=1 -DTESTING_TRYPERMUTATIONS=1 -o $@ -c $<
-+	$(CC) $(CFLAGS_DEBUG) -DTESTING=1 -DTESTING_TRYPERMUTATIONS=1 -c $< -o $@
- 
- 
- #######################################
-@@ -264,7 +264,7 @@
- # Add the dependencies here...
- TEST_DFIND_OBJS := dfind.o
- ALL_TEST_EXTRA_OBJS += $(TEST_DFIND_OBJS)
--test_dfind: $(TEST_DFIND_OBJS) $(ANUTILS_LIB) $(GSL_LIB)
-+test_dfind: $(TEST_DFIND_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(LIBM)
- 
- TEST_CTMF_OBJS := ctmf.o
- ALL_TEST_EXTRA_OBJS += $(TEST_CTMF_OBJS)
-@@ -280,31 +280,31 @@
- 
- #../util/cutest.o \
- 
--test_2mass: 2mass.o 2mass-fits.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+test_2mass: 2mass.o 2mass-fits.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_TEST_EXTRA_OBJS += 2mass-fits.o 2mass.o
- 
--test_usnob: usnob-fits.o usnob.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+test_usnob: usnob-fits.o usnob.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_TEST_EXTRA_OBJS += usnob-fits.o usnob.o
- 
--test_nomad: nomad-fits.o nomad.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+test_nomad: nomad-fits.o nomad.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_TEST_EXTRA_OBJS += nomad-fits.o nomad.o
- 
--test_matchfile: matchfile.o matchobj.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+test_matchfile: matchfile.o matchobj.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_TEST_EXTRA_OBJS += matchfile.o matchobj.o
- 
--test_blindutils: blindutils.o $(ANUTILS_LIB) $(GSL_LIB)
-+test_blindutils: blindutils.o $(ANUTILS_LIB) $(GSL_LIB) $(LIBM)
- ALL_TEST_EXTRA_OBJS += blindutils.o
- 
- test_dcen3x3: dcen3x3.o
- ALL_TEST_EXTRA_OBJS += dcen3x3.o
- 
--test_simplexy: $(SIMPLEXY_OBJ) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+test_simplexy: $(SIMPLEXY_OBJ) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_TEST_EXTRA_OBJS += $(SIMPLEXY_OBJ)
- 
--test_resort-xylist: resort-xylist.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+test_resort-xylist: resort-xylist.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_TEST_EXTRA_OBJS += resort-xylist.o
- 
--test_tweak: test_tweak.o tweak.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+test_tweak: test_tweak.o tweak.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_TEST_EXTRA_OBJS += tweak.o
- 
- ALL_TEST_LIBS += $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
-@@ -323,15 +323,15 @@
- 
- demo_dsmooth: demo_dsmooth.o dsmooth.o \
- 	$(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -pg
-+	$(CC)  $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LIBM) -pg -o $@
- 
- control-program: control-program.o \
- 		$(BACKEND_OBJS) $(SIMPLEXY_OBJ) \
--		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
-+		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) $(LIBM)
- ALL_OBJ += control-program.o
- 
- # qfits is only needed for writing debugging images...
--image2xy: image2xy-main.o image2xy-files.o $(SIMPLEXY_OBJ) $(CFITS_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+image2xy: image2xy-main.o image2xy-files.o $(SIMPLEXY_OBJ) $(CFITS_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- ALL_OBJ += image2xy-main.o image2xy-files.o
- 
-@@ -340,19 +340,19 @@
- ALL_OBJ += new-wcs-main.o
- 
- rdls2hpls: rdls2hpls.o \
--		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- rdlstohealpix: rdlstohealpix.o \
--		$(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- xylist2fits: xylist2fits.o \
--		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- certifiable: certifiable.o matchfile.o matchobj.o solvedfile.o \
--		$(UTILS_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTILS_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- fits-guess-scale: fits-guess-scale-main.o fits-guess-scale.o \
--		$(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- ALL_OBJ += fits-guess-scale-main.o
- 
-@@ -361,27 +361,27 @@
- 
- wcs-xy2rd: wcs-xy2rd-main.o wcs-xy2rd.o $(UTIL_OBJS) \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $(CCFLAGS) $^ $(LDFLAGS) $(WCSLIB_LIB)
-+	$(CC) $(CCFLAGS) $^ $(LDFLAGS) $(WCSLIB_LIB) $(LIBM) -o $@
- ALL_OBJ += wcs-xy2rd-main.o
- 
- wcs-rd2xy: wcs-rd2xy-main.o wcs-rd2xy.o $(UTIL_OBJS) \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $(CCFLAGS) $^ $(LDFLAGS) $(WCSLIB_LIB)
-+	$(CC) $(CCFLAGS) $^ $(LDFLAGS) $(WCSLIB_LIB) $(LIBM) -o $@
- ALL_OBJ += wcs-rd2xy-main.o
- 
- wcs-pv2sip: wcs-pv2sip.o tweak.o \
- 		$(ANLIBS) $(GSL_LIB)
- ALL_OBJ += wcs-pv2sip.o
- 
--noisesim: noisesim.o noise.o $(ANUTILS_LIB) $(GSL_LIB)
-+noisesim: noisesim.o noise.o $(ANUTILS_LIB) $(GSL_LIB) $(LIBM)
- 
--noisesim2: noisesim2.o noise.o $(ANUTILS_LIB) $(GSL_LIB)
-+noisesim2: noisesim2.o noise.o $(ANUTILS_LIB) $(GSL_LIB) $(LIBM)
- 
--hpgrid: hpgrid.o $(ANUTILS_LIB) $(GSL_LIB)
-+hpgrid: hpgrid.o $(ANUTILS_LIB) $(GSL_LIB) $(LIBM)
- 
--get-healpix: get-healpix.o $(ANUTILS_LIB) $(GSL_LIB)
-+get-healpix: get-healpix.o $(ANUTILS_LIB) $(GSL_LIB) $(LIBM)
- 
--$(CFITS_UTILS) :: %: %.o $(CFITS_LIB)
-+$(CFITS_UTILS) :: %: %.o $(CFITS_LIB) $(LIBM)
- 
- fitsverify: ftverify.c fvrf_data.c fvrf_file.c fvrf_head.c fvrf_key.c fvrf_misc.c $(CFITS_LIB)
- 	$(CC) -DSTANDALONE -trigraphs $(CFITS_INC) -o $@ $^ -lm
-@@ -389,15 +389,15 @@
- $(OLDEXECS) :: %: %.o $(OLDEXECS_OBJS) \
- 		$(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) $(QFITS_LIB)
- 
--catalog_analysis: catalog_analysis.o pnpoly.o $(ANUTILS_LIB) $(GSL_LIB)
-+catalog_analysis: catalog_analysis.o pnpoly.o $(ANUTILS_LIB) $(GSL_LIB) $(LIBM)
- 
- nomadtofits: nomadtofits.o nomad-fits.o nomad.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- read_nomad: read_nomad.o nomad.o
- 
- 2masstofits: $(2MASSOBJ) $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(ZLIB_LIB)
-+	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(ZLIB_LIB) $(LIBM) -o $@
- 
- diffractionFlag_check: diffractionFlag_check.o usnob-fits.o usnob.o \
- 		$(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-@@ -406,72 +406,72 @@
- 		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
- 
- usnobtofits: usnobtofits.o usnob-fits.o usnob.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
--hpowned: hpowned.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+hpowned: hpowned.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- build-an-catalog: build-an-catalog.o usnob-fits.o usnob.o \
- 		2mass-fits.o 2mass.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- cut-an: cut-an.o catalog.o usnob.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- startree: startree.o catalog.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- startree2: startree2-main.o startree2.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += startree2-main.o startree2.o
- 
- uniformize-catalog: uniformize-catalog-main.o uniformize-catalog.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += uniformize-catalog-main.o uniformize-catalog.o
- 
- build-index: build-index-main.o build-index.o uniformize-catalog.o startree2.o hpquads.o \
- 		quad-builder.o quad-utils.o codefile.o codetree.o unpermute-stars.o \
- 		unpermute-quads.o merge-index.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += build-index-main.o build-index.o uniformize-catalog.o quad-utils.o
- 
- hpquads: hpquads-main.o hpquads.o quad-builder.o quad-utils.o codefile.o pnpoly.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += hpquads-main.o quad-builder.o hpquads.o
- 
- allquads: allquads-main.o allquads.o quad-builder.o quad-utils.o codefile.o \
- 		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
- 
- codetree: codetree-main.o codetree.o codefile.o quad-utils.o \
--		$(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += codetree-main.o
- 
- unpermute-stars: unpermute-stars-main.o unpermute-stars.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += unpermute-stars-main.o
- 
- unpermute-quads: unpermute-quads-main.o unpermute-quads.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += unpermute-quads-main.o
- 
- merge-index: merge-index-main.o merge-index.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += merge-index-main.o
- 
- local-index: local-index.o build-index.o codetree.o startree2.o codetree.o \
- 		hpquads.o uniformize-catalog.o merge-index.o unpermute-quads.o unpermute-stars.o \
- 		quad-builder.o quad-utils.o codefile.o wcs-xy2rd.o \
- 		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $(CCFLAGS) $^ $(LDFLAGS) $(WCSLIB_LIB)
-+	$(CC) $(CCFLAGS) $^ $(LDFLAGS) $(WCSLIB_LIB) $(LIBM) -o $@
- ALL_OBJ += local-index.o
- 
- index-to-table: index-to-table.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- threadtest: threadtest.o $(BACKEND_LIB) \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
- 
- backend: backend-main.o $(BACKEND_LIB) \
--		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
-+		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) $(LIBM)
- ### TWEAK_DEBUG_PLOTS
- #backend: backend-main.o $(BACKEND_LIB) \
- #		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) \
-@@ -480,14 +480,14 @@
- 
- verify: verify-main.o verify.o verify2.o matchfile.o matchobj.o $(PLOTSTUFF) $(COMMON)/cairoutils.o \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB)
-+	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LIBM) -o $@
- 
- keirthing: keirthing.o blind_wcs.o tweak.o \
- 		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
- 
- dstnthing: dstnthing.o tweak2.o blind_wcs.o tweak.o matchfile.o matchobj.o verify.o scamp.o $(PLOTSTUFF) \
- 		$(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) 
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB)
-+	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBM) -o $@
- ALL_OBJ += dstnthing.o
- 
- ALL_OBJ += verify-main.o
-@@ -497,13 +497,13 @@
- 		fits-guess-scale.o wcs-rd2xy.o new-wcs.o \
- 		scamp.o \
- 		$(SIMPLEXY_OBJ) $(CFITS_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $(CCFLAGS) $^ $(LDFLAGS) $(WCSLIB_LIB)
-+	$(CC) $(CCFLAGS) $^ $(LDFLAGS) $(WCSLIB_LIB) $(LIBM) -o $@
- 
- ALL_OBJ += scamp.o cut-table.o
- 
- augment-xylist: augment-xylist-main.o augment-xylist.o tabsort.o cut-table.o fits-guess-scale.o \
- 		image2xy-files.o resort-xylist.o blindutils.o \
--		$(SIMPLEXY_OBJ) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(CFITS_LIB)
-+		$(SIMPLEXY_OBJ) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(CFITS_LIB) $(LIBM)
- 
- ALL_OBJ += augment-xylist-main.o
- 
-@@ -512,46 +512,46 @@
- 		blind_wcs.o tweak.o \
- 		$(UTIL_OBJS) \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@.tmp $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBM) -o $@.tmp
- 	mv $@.tmp $@
- 
- tweak: tweak-main.o blind_wcs.o verify.o matchfile.o \
- 		$(COMMON)/cairoutils.o $(PLOTSTUFF) \
- 		$(UTIL_OBJS) \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBM) -o $@
- 
- whynot: whynot.o matchfile.o matchobj.o codefile.o solvedclient.o \
- 		solvedfile.o verify.o blind_wcs.o quad-utils.o \
- 		$(COMMON)/cairoutils.o $(PLOTSTUFF) \
- 		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) 
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBM) -o $@
- ALL_OBJ += whynot.o
- 
- quadcenters: quadcenters.o \
--		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB)
-+		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(LIBM)
- 
- startree2rdls: startree2rdls.o \
--		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB)
-+		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(LIBM)
- 
- agreeable: agreeable.o matchfile.o matchobj.o solvedfile.o solvedclient.o verify.o \
--		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBKD_LIB) $(QFITS_LIB)
-+		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(LIBM)
- 
--rdlsinfo: rdlsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+rdlsinfo: rdlsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
--xylsinfo: xylsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+xylsinfo: xylsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- wcsinfo: wcsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) \
--		$(QFITS_LIB) $(GSL_LIB)
-+		$(QFITS_LIB) $(GSL_LIB) $(LIBM)
- 
--index-info: index-info.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+index-info: index-info.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- subwcs: subwcs.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) \
--		$(QFITS_LIB) $(GSL_LIB)
-+		$(QFITS_LIB) $(GSL_LIB) $(LIBM)
- ALL_OBJS += subwcs.o
- 
- wcs-grab: wcs-grab.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) \
--		$(QFITS_LIB)
-+		$(QFITS_LIB) $(LIBM)
- 
- printsolved: printsolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
- 
-@@ -565,7 +565,7 @@
- 
- plotcat: plotcat.o 2mass-fits.o 2mass.o nomad-fits.o nomad.o catalog.o usnob-fits.o usnob.o \
- 		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
--		$(QFITS_LIB)
-+		$(QFITS_LIB) $(LIBM)
- 
- plotquad.o: plotquad.c 
- 	$(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c $< -o $@
-@@ -574,34 +574,34 @@
- 	$(MAKE) -C $(COMMON) cairoutils.o
- 
- onepixel: onepixel.o $(COMMON)/cairoutils.o
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB)
-+	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LIBM) -o $@
- 
- plotquad: plotquad.o matchfile.o matchobj.o $(COMMON)/cairoutils.o \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB)
-+	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LIBM) -o $@
- 
- plot-xy-and-quad: plot-xy-and-quad.o matchfile.o $(COMMON)/cairoutils.o \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB)
-+	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LIBM) -o $@
- 
- plot-constellations.o: plot-constellations.c
- 	$(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c -o $@ $<
- 
- plot-constellations: plot-constellations.o $(COMMON)/cairoutils.o \
- 		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) $(LDFLAGS) $^ -o $@ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB)
-+	$(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LIBM) -o $@
- 
- catalog-dists: catalog-dists.o 2mass-fits.o usnob-fits.o usnob.o \
- 		$(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
- 
- add-text: add-text.o $(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) $(LDFLAGS) $^ -o $@ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB)
-+	$(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LIBM) -o $@
- 
- plotstuff.o: plotstuff.c
- 	$(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c -o $@ $<
- 
- plotstuff: plotstuff-main.o $(PLOTSTUFF) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB)
-+	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBM) -o $@
- ALL_OBJ += plotstuff-main.o
- 
- PLOTSTUFF_SRCS = $(subst .o,.c,$(PLOTSTUFF))
-@@ -625,39 +625,39 @@
- 	$(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c $< -o $@
- 
- plotxy: plotxy-main.o $(PLOTSTUFF) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB)
-+	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBM) -o $@
- ALL_OBJ += plotxy-main.o
- 
- test_plotstuff: test_plotstuff-main.o test_plotstuff.o $(COMMON)/cutest.o $(PLOTSTUFF) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB)
-+	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LIBM) -o $@
- test_plotstuff-main.c: test_plotstuff.c
- 	$(AN_SHELL) $(MAKE_TESTS) $^ > $@
- 
--query-starkd: query-starkd.o $(ANLIBS)
-+query-starkd: query-starkd.o $(ANLIBS) $(LIBM)
- ALL_OBJ += query-starkd.o
- 
--quadidx: quadidx.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+quadidx: quadidx.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
--codeprojections: codeprojections.o $(UTIL_OBJS) $(ANLIBS)
-+codeprojections: codeprojections.o $(UTIL_OBJS) $(ANLIBS) $(LIBM)
- 
- quadscales: quadscales.o \
- 		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
--		$(QFITS_LIB)
-+		$(QFITS_LIB) $(LIBM)
- 
- index-stats: index-stats.o \
- 		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
--		$(QFITS_LIB)
-+		$(QFITS_LIB) $(LIBM)
- 
- quadsperstar: quadsperstar.o \
- 		$(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) \
--		$(QFITS_LIB)
-+		$(QFITS_LIB) $(LIBM)
- 
- fitsgetext: fitsgetext.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
- 
- fits-dedup: fits-dedup.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
- 
- wcs-resample: wcs-resample-main.o wcs-resample.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $^ $(LDFLAGS) $(WCSLIB_LIB)
-+	$(CC) $^ $(LDFLAGS) $(WCSLIB_LIB) $(LIBM) -o $@
- 
- 
- subtable: subtable.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-@@ -668,15 +668,15 @@
- 
- column-merge: column-merge.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
- 
--add-healpix-column: add-healpix-column.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+add-healpix-column: add-healpix-column.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- resort-xylist: resort-xylist-main.o resort-xylist.o $(UTIL_OBJS) \
--		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-+		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBM)
- 
- ALL_OBJ += resort-xylist-main.o
- 
- bgsubtract: bgsubtract.o ctmf.o $(COMMON)/cairoutils.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB)
-+	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LIBM) -o $@
- 
- usnob-scamp-catalog: usnob-scamp-catalog.o usnob-fits.o usnob.o $(UTIL_OBJS) \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
-
-diff -Nur astrometry.net-0.38.orig/libkd/Makefile astrometry.net-0.38/libkd/Makefile
---- astrometry.net-0.38.orig/libkd/Makefile	2010-11-15 22:26:43.000000000 +0000
-+++ astrometry.net-0.38/libkd/Makefile	2012-05-09 18:29:56.000000000 +0100
-@@ -49,7 +49,7 @@
- #CFLAGS += -DKDTREE_MEM_TRACK
- 
- LDFLAGS := $(LDFLAGS_DEF)
--LDFLAGS += -lm
-+LIBM = -lm
- 
- LIBKD := libkd.a
- 
-@@ -93,9 +93,9 @@
- 
- DEP_OBJ += $(PYSPHEREMATCH_OBJ)
- 
--checktree: checktree.o $(LIBKD) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB)
-+checktree: checktree.o $(LIBKD) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LIBM)
- 
--fix-bb: fix-bb.o $(LIBKD) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB)
-+fix-bb: fix-bb.o $(LIBKD) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LIBM)
- 
- DEP_OBJ += fix-bb.o checktree.o
- 
-diff -Nur astrometry.net-0.38.orig/util/Makefile astrometry.net-0.38/util/Makefile
---- astrometry.net-0.38.orig/util/Makefile	2010-11-19 20:47:53.000000000 +0000
-+++ astrometry.net-0.38/util/Makefile	2012-05-09 18:22:01.000000000 +0100
-@@ -26,7 +26,7 @@
- $(DATA)/%.dat: ;
- 
- %.o: %.c
--	$(CC) -o $@ $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) -c $< -o $@
- 
- # You can build stripped-down versions of the AN libraries that do not
- # depend on libkd or libqfits by defining the following in your Makefile
-@@ -74,7 +74,7 @@
- endif
- 
- LDFLAGS += $(LDFLAGS_DEF)
--LDFLAGS += -lm
-+LIBM = -lm
- 
- ifndef NO_QFITS
- CFLAGS += $(QFITS_INC)
-@@ -169,11 +169,11 @@
- 
- resample: resample.o \
- 		$(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(LIBM) -o $@ 
- ALL_OBJ += resampe.o
- 
- tycho2tofits: tycho2tofits.o \
--		$(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB)
-+		$(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += tycho2tofits.o
- 
- tycho2tostellarium: tycho2tostellarium.o $(ANUTILS_LIB) $(QFITS_LIB)
-@@ -193,10 +193,10 @@
- _sip.so: sip-utils.o gslutils.o sip.o starutil.o mathutil.o sip_qfits.o \
- 		fitsioutils.o errors.o ioutils.o bl.o os-features.o an-endian.o \
- 		log.o $(QFITS_LIB) $(GSL_LIB)
--	$(CC) $(SHAREDLIBFLAGS) -o $@ $^
-+	$(CC) $(SHAREDLIBFLAGS) $^ -o $@
- 
- _healpix.so: healpix-utils.o healpix.o permutedsort.o starutil.o mathutil.o errors.o ioutils.o bl.o log.o os-features.o
--	$(CC) $(SHAREDLIBFLAGS) -o $@ $^
-+	$(CC) $(SHAREDLIBFLAGS) $^ -o $@
- 
- index_wrap.c: index.i index.h
- 	swig -python -I. $<
-@@ -208,30 +208,30 @@
- 	cp build/lib/_index_util.so _index_util.so
- 
- coadd: coadd-main.o $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(LIBM) -o $@
- ALL_OBJ += coadd.o coadd-main.o
- 
- pad-file: pad-file.o $(ANUTILS_LIB)
- ALL_OBJ += pad-file.o
- 
--an-fitstopnm: an-fitstopnm.o $(ANUTILS_LIB) $(QFITS_LIB)
-+an-fitstopnm: an-fitstopnm.o $(ANUTILS_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += an-fitstopnm.o
- 
- an-pnmtofits: an-pnmtofits.o $(ANUTILS_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(NETPBM_LIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(NETPBM_LIB) $(LIBM) -o $@
- ALL_OBJ += an-pnmtofits.o
- 
--downsample-fits: downsample-fits.o $(ANUTILS_LIB) $(QFITS_LIB)
-+downsample-fits: downsample-fits.o $(ANUTILS_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += downsample-fits.o
- 
--smooth-image: smooth-image.o $(ANUTILS_LIB) $(QFITS_LIB)
-+smooth-image: smooth-image.o $(ANUTILS_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += smooth-image.o
- 
- fits-flip-endian: fits-flip-endian.o $(ANUTILS_LIB) $(QFITS_LIB)
- ALL_OBJ += fits-flip-endian.o
- 
- search-index: search-index.o \
--		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB)
-+		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LIBM)
- ALL_OBJ += search-index.o
- 
- PYTHON_INSTALL := fits2fits.py image2pnm.py healpix.py sip.py starutil.py \
-@@ -285,32 +285,36 @@
- 	@echo "---- Error messages in the next few commands are not necessarily bugs ----"
- 	@echo "     (we're checking how things works on your computer)"
- 	( \
--	 (($(CC) -o os-features-test-canonicalize \
--	   $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $(LDFLAGS) $^  > /dev/null && \
-+	 (($(CC) \
-+	   $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $(LDFLAGS) $^ $(LIBM) \
-+	   -o os-features-test-canonicalize > /dev/null && \
- 	   ./os-features-test-canonicalize > /dev/null && \
- 	   echo "#define NEED_CANONICALIZE_FILE_NAME 0") \
- 	|| echo "#define NEED_CANONICALIZE_FILE_NAME 1") \
- 	; \
--	 (($(CC) -o os-features-test-declare-qsort \
--	   $(CFLAGS) -DTEST_DECLARE_QSORT_R $(LDFLAGS) $^ > /dev/null && \
-+	 (($(CC) \
-+	   $(CFLAGS) -DTEST_DECLARE_QSORT_R $(LDFLAGS) $^ $(LIBM) \
-+	   -o os-features-test-declare-qsort > /dev/null && \
- 	   ./os-features-test-declare-qsort > /dev/null && \
- 	   echo "#define NEED_DECLARE_QSORT_R 1") \
- 	|| echo "#define NEED_DECLARE_QSORT_R 0") \
- 	; \
--	 (($(CC) -o os-features-test-qsort \
--	   $(CFLAGS) -DTEST_QSORT_R $(LDFLAGS) $^ > /dev/null && \
-+	 (($(CC) \
-+	   $(CFLAGS) -DTEST_QSORT_R $(LDFLAGS) $^ $(LIBM) \
-+	   -o os-features-test-qsort > /dev/null && \
- 	   ./os-features-test-qsort > /dev/null && \
- 	   echo "#define NEED_QSORT_R 0") \
- 	|| echo "#define NEED_QSORT_R 1") \
- 	; \
--	 (($(CC) -o os-features-test-swap-qsort \
--	   $(CFLAGS) -DTEST_SWAP_QSORT_R $(LDFLAGS) $^ > /dev/null && \
-+	 (($(CC) \
-+	   $(CFLAGS) -DTEST_SWAP_QSORT_R $(LDFLAGS) $^ $(LIBM) \
-+	   -o os-features-test-swap-qsort > /dev/null && \
- 	   ./os-features-test-swap-qsort > /dev/null && \
- 	   echo "#define NEED_SWAP_QSORT_R 1") \
- 	|| echo "#define NEED_SWAP_QSORT_R 0") \
- 	; \
--	 (($(CC) -o os-features-test-netpbm \
--	   $(CFLAGS) -DTEST_NETPBM $(LDFLAGS) $(NETPBM_INC_ORIG) $(NETPBM_LIB_ORIG) $^ > /dev/null && \
-+	 (($(CC) \
-+	   $(CFLAGS) -DTEST_NETPBM $(LDFLAGS) $(NETPBM_INC_ORIG) $(NETPBM_LIB_ORIG) $(LIBM) $^ -o os-features-test-netpbm > /dev/null && \
- 	   ./os-features-test-netpbm > /dev/null && \
- 	   echo "#define HAVE_NETPBM 1") \
- 	|| echo "#define HAVE_NETPBM 0") \
-@@ -321,8 +325,8 @@
- makefile.os-features: os-features-test.c
- 	( \
- 	 echo "# This file is generated by util/Makefile."; \
--	 (($(CC) -o os-features-test-netpbm-make \
--	   $(CFLAGS) -DTEST_NETPBM_MAKE $(LDFLAGS) $(NETPBM_INC_ORIG) $(NETPBM_LIB_ORIG) $^ > /dev/null && \
-+	 (($(CC) \
-+	   $(CFLAGS) -DTEST_NETPBM_MAKE $(LDFLAGS) $(NETPBM_INC_ORIG) $(NETPBM_LIB_ORIG) $(LIBM) $^ -o os-features-test-netpbm-make > /dev/null && \
- 	   ./os-features-test-netpbm-make > /dev/null && \
- 	   echo "HAVE_NETPBM := yes") \
- 	|| echo "# Don't HAVE_NETPBM.") \
-@@ -354,7 +358,7 @@
- 
- grab-stellarium-constellations: grab-stellarium-constellations.o \
- 		starutil.o mathutil.o bl.o an-endian.o
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBM) -o $@
- 
- hd1.fits: henry-draper.tsv build-hd-tree
- 	build-hd-tree -s -R 16 henry-draper.tsv $@
-@@ -404,7 +408,7 @@
- test_sip-utils: $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
- 
- test_anwcs: $(ANUTILS_LIB) $(QFITS_LIB)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(LIBM) -o $@
- 
- test_tycho2: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB)
- 
-diff -Nur astrometry.net-0.38.orig/util/makefile.tests astrometry.net-0.38/util/makefile.tests
---- astrometry.net-0.38.orig/util/makefile.tests	2010-07-16 20:48:05.000000000 +0100
-+++ astrometry.net-0.38/util/makefile.tests	2012-05-09 19:15:29.000000000 +0100
-@@ -50,5 +50,5 @@
- 	$(AN_SHELL) $(MAKE_TESTS) $(TEST_SOURCES) > $@
- 
- test: test.o $(COMMON)/cutest.o $(ALL_TEST_FILES_O) $(sort $(ALL_TEST_EXTRA_OBJS)) $(ALL_TEST_LIBS)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) -lm -o $@
- 
diff --git a/sci-astronomy/astrometry/files/0.38-missing-headers.patch b/sci-astronomy/astrometry/files/0.38-missing-headers.patch
deleted file mode 100644
index c8f50ebea..000000000
--- a/sci-astronomy/astrometry/files/0.38-missing-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur astrometry.net-0.38.orig/util/cairoutils.c astrometry.net-0.38/util/cairoutils.c
---- astrometry.net-0.38.orig/util/cairoutils.c	2010-09-25 14:38:24.000000000 +0100
-+++ astrometry.net-0.38/util/cairoutils.c	2012-05-09 19:04:06.000000000 +0100
-@@ -26,6 +26,7 @@
- #include <cairo.h>
- #include <png.h>
- #include <jpeglib.h>
-+#include <zlib.h>
- 
- #include "an-bool.h"
- #include "os-features.h"
diff --git a/sci-astronomy/astrometry/files/0.38-strict-aliasing.patch b/sci-astronomy/astrometry/files/0.38-strict-aliasing.patch
deleted file mode 100644
index f9d09a1cf..000000000
--- a/sci-astronomy/astrometry/files/0.38-strict-aliasing.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur astrometry.net-0.38.orig/qfits-an/src/qfits_image.c astrometry.net-0.38/qfits-an/src/qfits_image.c
---- astrometry.net-0.38.orig/qfits-an/src/qfits_image.c	2009-11-30 15:13:05.000000000 +0000
-+++ astrometry.net-0.38/qfits-an/src/qfits_image.c	2012-05-09 22:51:13.000000000 +0100
-@@ -1100,7 +1100,7 @@
- #ifndef WORDS_BIGENDIAN
-             qfits_swap_bytes(XLpix, 8);
- #endif
--            dpix = *((double*)XLpix);
-+            dpix = (double)(*XLpix);
-             *p_dest ++ = (float)(bscale * dpix + bzero);
-         }
-         break;
-@@ -1200,7 +1200,7 @@
- #ifndef WORDS_BIGENDIAN
-             qfits_swap_bytes(XLpix, 8);
- #endif
--            dpix = *((double*)XLpix);
-+            dpix = (double)(*XLpix);
-             *p_dest ++ = (int)(bscale * dpix + bzero);
-         }
-         break;
-@@ -1301,7 +1301,7 @@
- #ifndef WORDS_BIGENDIAN
-             qfits_swap_bytes(XLpix, 8);
- #endif
--            dpix = *((double*)XLpix);
-+            dpix = (double)(*XLpix);
-             *p_dest ++ = (double)(bscale * dpix + bzero);
-         }
-         break;
diff --git a/sci-astronomy/astrometry/files/0.38-system-libs.patch b/sci-astronomy/astrometry/files/0.38-system-libs.patch
deleted file mode 100644
index eb206bd0c..000000000
--- a/sci-astronomy/astrometry/files/0.38-system-libs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur astrometry.net-0.38.orig/util/makefile.cfitsio astrometry.net-0.38/util/makefile.cfitsio
---- astrometry.net-0.38.orig/util/makefile.cfitsio	2008-05-17 02:46:19.000000000 +0100
-+++ astrometry.net-0.38/util/makefile.cfitsio	2012-05-09 20:11:25.000000000 +0100
-@@ -14,22 +14,5 @@
- # along with the Astrometry.net suite ; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
--CFITS_DIR := $(BASEDIR)/cfitsio
--CFITS_INC := -I$(CFITS_DIR)
--CFITS_LIB := $(CFITS_DIR)/libcfitsio.a
--
--# CFLAGS to pass to CFITSIO's configure.
--CFITS_CONFIG_CFLAGS := $(CFLAGS_DEF)
--
--$(CFITS_LIB): $(wildcard $(CFITS_DIR)/*.c) $(wildcard $(CFITS_DIR)/*.h) $(CFITS_DIR)/Makefile
--	cd $(CFITS_DIR) && $(MAKE)
--
--$(CFITS_DIR)/Makefile: $(CFITS_DIR)/Makefile.in
--	cd $(CFITS_DIR) && CFLAGS="$(CFITS_CONFIG_CFLAGS)" CC="$(CC)" ./configure 
--
--$(CFITS_DIR)/Makefile.in: ;
--
--REMAKE_CFITSIO := remake-cfitsio
--.PHONY: $(REMAKE_CFITSIO)
--$(REMAKE_CFITSIO): $(CFITS_DIR)/Makefile
--	cd $(CFITS_DIR) && $(MAKE)
-+CFITS_INC := $(shell pkg-config --cflags cfitsio 2>/dev/null)
-+CFITS_LIB := $(shell pkg-config --libs cfitsio 2>/dev/null)
-diff -Nur astrometry.net-0.38.orig/util/makefile.gsl astrometry.net-0.38/util/makefile.gsl
---- astrometry.net-0.38.orig/util/makefile.gsl	2008-04-15 22:08:08.000000000 +0100
-+++ astrometry.net-0.38/util/makefile.gsl	2012-05-09 20:12:43.000000000 +0100
-@@ -14,14 +14,5 @@
- # along with the Astrometry.net suite ; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
--GSL_DIR := $(BASEDIR)/gsl-an
--GSL_INC := -I$(GSL_DIR)
--GSL_LIB := $(GSL_DIR)/libgsl-an.a
--
--$(GSL_LIB):
--	cd $(GSL_DIR) && $(MAKE)
--
--REMAKE_GSL := remake-gsl
--.PHONY: $(REMAKE_GSL)
--$(REMAKE_GSL):
--	cd $(GSL_DIR) && $(MAKE)
-+GSL_INC := $(shell pkg-config --cflags gsl 2> /dev/null)
-+GSL_LIB := $(shell pkg-config --libs gsl 2> /dev/null)
diff --git a/sci-astronomy/astrometry/files/0.43-as-needed.patch b/sci-astronomy/astrometry/files/0.43-as-needed.patch
new file mode 100644
index 000000000..244713d3b
--- /dev/null
+++ b/sci-astronomy/astrometry/files/0.43-as-needed.patch
@@ -0,0 +1,366 @@
+Make it work when linking with -Wl,--as-needed
+See http://www.gentoo.org/proj/en/qa/asneeded.xml
+bicatali@gentoo.org - 06/2013
+
+diff -Nur astrometry.net-0.43.orig/blind/Makefile astrometry.net-0.43/blind/Makefile
+--- astrometry.net-0.43.orig/blind/Makefile	2013-03-01 12:29:34.000000000 -0800
++++ astrometry.net-0.43/blind/Makefile	2013-06-13 15:54:15.915430597 -0700
+@@ -140,7 +140,7 @@
+ 
+ $(BACKEND_SO): $(BACKEND_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
+ 		$(QFITS_LIB) $(GSL_LIB)
+-	$(CC) $(SHAREDLIBFLAGS) -o $@ $^
++	$(CC) $(SHAREDLIBFLAGS) $^ -o $@
+ 
+ # old and miscellaneous executables that aren't part of the pipeline.
+ OLDEXECS := plotquads rawstartree checkquads
+@@ -350,7 +350,7 @@
+ 
+ demo_dsmooth: demo_dsmooth.o dsmooth.o \
+ 	$(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -pg $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -pg $(LDLIBS) -o $@
+ 
+ control-program: control-program.o \
+ 		$(BACKEND_OBJS) $(SIMPLEXY_OBJ) \
+@@ -359,7 +359,7 @@
+ 
+ # qfits is only needed for writing debugging images...
+ image2xy: image2xy-main.o image2xy-files.o $(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@
+ 
+ ALL_OBJ += image2xy-main.o image2xy-files.o
+ 
+@@ -397,12 +397,12 @@
+ 
+ wcs-xy2rd: wcs-xy2rd-main.o wcs-xy2rd.o $(UTIL_OBJS) \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += wcs-xy2rd-main.o
+ 
+ wcs-rd2xy: wcs-rd2xy-main.o wcs-rd2xy.o $(UTIL_OBJS) \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += wcs-rd2xy-main.o
+ 
+ wcs-pv2sip: wcs-pv2sip.o tweak.o \
+@@ -412,10 +412,10 @@
+ hpgrid: hpgrid.o $(ANUTILS_LIB) $(GSL_LIB)
+ 
+ $(CFITS_UTILS) :: %: %.o $(CFITS_DEP)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@
+ 
+ fitsverify: ftverify.c fvrf_data.c fvrf_file.c fvrf_head.c fvrf_key.c fvrf_misc.c $(CFITS_DEP)
+-	$(CC) -DSTANDALONE -trigraphs $(CFITS_INC) -o $@ $^ $(CFITS_LIB) -lm
++	$(CC) -DSTANDALONE -trigraphs $(CFITS_INC) $^ $(CFITS_LIB) -lm -o $@
+ 
+ $(OLDEXECS) :: %: %.o $(OLDEXECS_OBJS) \
+ 		$(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) $(QFITS_LIB)
+@@ -427,12 +427,12 @@
+ 
+ ucac3tofits: ucac3tofits.o ucac3-fits.o ucac3.o \
+ 		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $^ $(LDFLAGS) -lbz2 $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) -lbz2 $(LDLIBS) -o $@
+ 
+ read_nomad: read_nomad.o nomad.o
+ 
+ 2masstofits: $(2MASSOBJ) $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ZLIB_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(ZLIB_LIB) $(LDLIBS) -o $@
+ 
+ diffractionFlag_check: diffractionFlag_check.o usnob-fits.o usnob.o \
+ 		$(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+@@ -496,7 +496,7 @@
+ 		hpquads.o uniformize-catalog.o merge-index.o unpermute-quads.o unpermute-stars.o \
+ 		quad-builder.o quad-utils.o codefile.o wcs-xy2rd.o \
+ 		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += local-index.o
+ 
+ index-to-table: index-to-table.o \
+@@ -515,14 +515,14 @@
+ 
+ verify: verify-main.o verify.o verify2.o matchfile.o matchobj.o $(PLOTSTUFF) $(COMMON)/cairoutils.o \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -o $@
+ 
+ keirthing: keirthing.o tweak.o \
+ 		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
+ 
+ dstnthing: dstnthing.o tweak2.o tweak.o matchfile.o matchobj.o verify.o scamp.o $(PLOTSTUFF) \
+ 		$(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) 
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += dstnthing.o
+ 
+ ALL_OBJ += verify-main.o
+@@ -532,14 +532,14 @@
+ 		fits-guess-scale.o wcs-rd2xy.o new-wcs.o \
+ 		scamp.o \
+ 		$(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(CFITS_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(CFITS_LIB) $(LDLIBS) -o $@
+ 
+ ALL_OBJ += scamp.o cut-table.o
+ 
+ augment-xylist: augment-xylist-main.o augment-xylist.o tabsort.o cut-table.o fits-guess-scale.o \
+ 		image2xy-files.o resort-xylist.o blindutils.o \
+ 		$(SIMPLEXY_OBJ) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(CFITS_DEP)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@
+ 
+ ALL_OBJ += augment-xylist-main.o
+ 
+@@ -548,20 +548,20 @@
+ 		tweak.o \
+ 		$(UTIL_OBJS) \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@.tmp $^ $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@.tmp
+ 	mv $@.tmp $@
+ 
+ tweak: tweak-main.o verify.o matchfile.o \
+ 		$(COMMON)/cairoutils.o $(PLOTSTUFF) \
+ 		$(UTIL_OBJS) \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
+ 
+ whynot: whynot.o matchfile.o matchobj.o codefile.o solvedclient.o \
+ 		solvedfile.o verify.o quad-utils.o \
+ 		$(PLOTSTUFF) $(COMMON)/cairoutils.o $(CATS_LIB) \
+ 		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) 
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += whynot.o
+ 
+ quadcenters: quadcenters.o \
+@@ -597,7 +597,7 @@
+ 
+ solvedserver: solvedserver.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) \
+ 		$(QFITS_LIB)
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS)
++	$(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
+ 
+ plotcat: plotcat.o 2mass-fits.o 2mass.o nomad-fits.o nomad.o catalog.o usnob-fits.o usnob.o \
+ 		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
+@@ -610,28 +610,28 @@
+ 	$(MAKE) -C $(COMMON) cairoutils.o
+ 
+ onepixel: onepixel.o $(COMMON)/cairoutils.o
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
+ 
+ plotquad: plotquad.o matchfile.o matchobj.o $(COMMON)/cairoutils.o \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
+ 
+ plot-xy-and-quad: plot-xy-and-quad.o matchfile.o $(COMMON)/cairoutils.o \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
+ 
+ plot-constellations.o: plot-constellations.c
+ 	$(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) $(CATS_INC) -c -o $@ $<
+ 
+ plot-constellations: plot-constellations.o $(CATS_LIB) $(COMMON)/cairoutils.o \
+ 		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $(LDFLAGS) $^ -o $@ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS)
++	$(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
+ 
+ catalog-dists: catalog-dists.o 2mass-fits.o usnob-fits.o usnob.o \
+ 		$(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+ 
+ add-text: add-text.o $(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $(LDFLAGS) $^ -o $@ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS)
++	$(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
+ 
+ PYTHON_EXECS := plotann.py
+ PYTHON_INSTALL := $(PYTHON_EXECS)
+@@ -645,7 +645,7 @@
+ 	$(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c -o $@ $<
+ 
+ plotstuff: plotstuff-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += plotstuff-main.o
+ 
+ PLOTSTUFF_SRCS = $(subst .o,.c,$(PLOTSTUFF))
+@@ -674,11 +674,11 @@
+ 
+ plotxy: plotxy-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o \
+ 		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += plotxy-main.o
+ 
+ test_plotstuff: test_plotstuff-main.o test_plotstuff.o $(COMMON)/cutest.o $(PLOTSTUFF) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LDLIBS) -o $@
+ test_plotstuff-main.c: test_plotstuff.c
+ 	$(AN_SHELL) $(MAKE_TESTS) $^ > $@
+ 
+@@ -719,7 +719,7 @@
+ ALL_OBJ += resort-xylist-main.o
+ 
+ bgsubtract: bgsubtract.o ctmf.o $(COMMON)/cairoutils.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
+ 
+ usnob-scamp-catalog: usnob-scamp-catalog.o usnob-fits.o usnob.o $(UTIL_OBJS) \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+diff -Nur astrometry.net-0.43.orig/util/Makefile astrometry.net-0.43/util/Makefile
+--- astrometry.net-0.43.orig/util/Makefile	2013-02-18 07:12:36.000000000 -0800
++++ astrometry.net-0.43/util/Makefile	2013-06-13 17:05:10.551069687 -0700
+@@ -181,7 +181,7 @@
+ 
+ resample: resample-main.o \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += resampe.o
+ 
+ tycho2tofits: tycho2tofits.o \
+@@ -195,10 +195,10 @@
+ _sip.so: sip-utils.o gslutils.o sip.o starutil.o mathutil.o sip_qfits.o \
+ 		fitsioutils.o errors.o ioutils.o bl.o os-features.o an-endian.o \
+ 		log.o tic.o $(QFITS_LIB) $(GSL_LIB)
+-	$(CC) $(SHAREDLIBFLAGS) -o $@ $^
++	$(CC) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@
+ 
+ _healpix.so: healpix-utils.o healpix.o permutedsort.o starutil.o mathutil.o errors.o ioutils.o bl.o log.o tic.o os-features.o
+-	$(CC) $(SHAREDLIBFLAGS) -o $@ $^
++	$(CC) $(SHAREDLIBFLAGS) $^ -o $@
+ 
+ util.py util_wrap.c: util.i $(ANUTILS_H)
+ 	swig -python -I. $<
+@@ -225,22 +225,22 @@
+ 	cp build/lib/_index_util.so _index_util.so
+ 
+ coadd: coadd-main.o $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) $(WCS_LIB_DEP)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += coadd.o coadd-main.o
+ 
+ wcs-resample: wcs-resample-main.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) -o $@ $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += wcs-resample-main.o
+ 
+ fit-wcs: fit-wcs-main.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) -o $@ $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += fit-wcs-main.o
+ 
+ get-healpix: get-healpix.o $(ANUTILS_LIB) $(GSL_LIB)
+ ALL_OBJ += get-healpix.o
+ 
+ wcs-to-tan: wcs-to-tan.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) -o $@ $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS)
++	$(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += wcs-to-tan.o
+ 
+ pad-file: pad-file.o $(ANUTILS_LIB)
+@@ -253,7 +253,7 @@
+ ALL_OBJ += add-healpix-column.o
+ 
+ an-pnmtofits: an-pnmtofits.o $(ANUTILS_LIB) $(QFITS_LIB)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += an-pnmtofits.o
+ 
+ downsample-fits: downsample-fits.o $(ANUTILS_LIB) $(QFITS_LIB)
+@@ -334,32 +334,32 @@
+ 	@echo
+ 	@echo "Testing canonicalize_file_name..."
+ 	@echo "Testing canonicalize_file_name..." >> os-features.log
+-	(($(CC) -o os-features-test-canonicalize \
+-	  $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ $(LDFLAGS) >> os-features.log && \
++	(($(CC) $(LDFLAGS) \
++	  $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ -o os-features-test-canonicalize >> os-features.log && \
+ 	  ./os-features-test-canonicalize >> os-features.log && \
+ 	  echo "#define NEED_CANONICALIZE_FILE_NAME 0") \
+ 	|| echo "#define NEED_CANONICALIZE_FILE_NAME 1") >> $@.tmp
+ 	@echo
+ 	@echo "Testing declare qsort_r..."
+ 	@echo "Testing declare qsort_r..." >> os-features.log
+-	(($(CC) -o os-features-test-declare-qsort \
+-	   $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
++	(($(CC) $(LDFLAGS) \
++	   $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ -o os-features-test-declare-qsort >> os-features.log && \
+ 	   ./os-features-test-declare-qsort >> os-features.log && \
+ 	   echo "#define NEED_DECLARE_QSORT_R 1") \
+ 	|| echo "#define NEED_DECLARE_QSORT_R 0") >> $@.tmp
+ 	@echo
+ 	@echo "Testing qsort_r..."
+ 	@echo "Testing qsort_r..." >> os-features.log
+-	(($(CC) -o os-features-test-qsort \
+-	   $(CFLAGS) -DTEST_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
++	(($(CC) $(LDFLAGS) \
++	   $(CFLAGS) -DTEST_QSORT_R $^ -o os-features-test-qsort >> os-features.log && \
+ 	   ./os-features-test-qsort >> os-features.log && \
+ 	   echo "#define NEED_QSORT_R 0") \
+ 	|| echo "#define NEED_QSORT_R 1") >> $@.tmp
+ 	@echo
+ 	@echo "Testing swap qsort_r..."
+ 	@echo "Testing swap qsort_r..." >> os-features.log
+-	(($(CC) -Werror -o os-features-test-swap-qsort \
+-	   $(CFLAGS) -DTEST_SWAP_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
++	(($(CC) $(LDFLAGS) -Werror \
++	   $(CFLAGS) -DTEST_SWAP_QSORT_R $^  -o os-features-test-swap-qsort >> os-features.log && \
+ 	   ./os-features-test-swap-qsort >> os-features.log && \
+ 	   echo "#define NEED_SWAP_QSORT_R 0") \
+ 	|| echo "#define NEED_SWAP_QSORT_R 1") >> $@.tmp
+@@ -368,8 +368,8 @@
+ 	@echo "   NETPBM_INC is $(NETPBM_INC_ORIG)"
+ 	@echo "   NETPBM_LIB is $(NETPBM_LIB_ORIG)"
+ 	@echo "Testing netpbm..." >> os-features.log
+-	(($(CC) -o os-features-test-netpbm \
+-	   $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features.log && \
++	(($(CC) $(LDFLAGS) \
++	   $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(NETPBM_LIB_ORIG) -o os-features-test-netpbm >> os-features.log && \
+ 	   ./os-features-test-netpbm >> os-features.log && \
+ 	   echo "#define HAVE_NETPBM 1") \
+ 	|| echo "#define HAVE_NETPBM 0") >> $@.tmp
+@@ -392,8 +392,8 @@
+ 	-rm -f os-features-makefile.log
+ 	( \
+ 	 echo "# This file is generated by util/Makefile."; \
+-	 (($(CC) -o os-features-test-netpbm-make \
+-	   $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \
++	 (($(CC) $(LDFLAGS) \
++	   $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(NETPBM_LIB_ORIG)  -o os-features-test-netpbm-make >> os-features-makefile.log && \
+ 	   ./os-features-test-netpbm-make >> os-features-makefile.log && \
+ 	   echo "HAVE_NETPBM := yes") \
+ 	|| (echo "# Astrometry.net didn't find netpbm; not setting HAVE_NETPBM."; \
+@@ -502,10 +502,10 @@
+ test_sip-utils: $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
+ 
+ test_anwcs: $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB)
++	$(CC)$(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) -o $@
+ 
+ test_wcs: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) -o $@
+ 
+ test_tycho2: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB)
+ 
+diff -Nur astrometry.net-0.43.orig/util/makefile.tests astrometry.net-0.43/util/makefile.tests
+--- astrometry.net-0.43.orig/util/makefile.tests	2010-07-16 12:48:05.000000000 -0700
++++ astrometry.net-0.43/util/makefile.tests	2013-06-13 16:24:33.816558534 -0700
+@@ -50,5 +50,5 @@
+ 	$(AN_SHELL) $(MAKE_TESTS) $(TEST_SOURCES) > $@
+ 
+ test: test.o $(COMMON)/cutest.o $(ALL_TEST_FILES_O) $(sort $(ALL_TEST_EXTRA_OBJS)) $(ALL_TEST_LIBS)
+-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) -o $@
+ 
diff --git a/sci-astronomy/astrometry/files/0.38-respect-user-flags.patch b/sci-astronomy/astrometry/files/0.43-respect-user-flags.patch
index bff6556bf..49aadab76 100644
--- a/sci-astronomy/astrometry/files/0.38-respect-user-flags.patch
+++ b/sci-astronomy/astrometry/files/0.43-respect-user-flags.patch
@@ -1,3 +1,6 @@
+Respect user optimization flags
+bicatali@gentoo.org - 06/2013
+
 --- astrometry.net-0.38.orig/util/makefile.common	2010-08-26 14:43:44.000000000 +0100
 +++ astrometry.net-0.38/util/makefile.common	2012-05-09 23:21:10.000000000 +0100
 @@ -145,8 +145,6 @@
diff --git a/sci-astronomy/astrometry/files/0.43-system-libs.patch b/sci-astronomy/astrometry/files/0.43-system-libs.patch
new file mode 100644
index 000000000..7027e0954
--- /dev/null
+++ b/sci-astronomy/astrometry/files/0.43-system-libs.patch
@@ -0,0 +1,704 @@
+effort to link with gsl installed from system
+to be applied after the as-needed patch
+bicatali@gentoo.org - 06/2013
+
+diff -Nur astrometry.net-0.43.as-needed/blind/Makefile astrometry.net-0.43/blind/Makefile
+--- astrometry.net-0.43.as-needed/blind/Makefile	2013-06-13 15:54:15.915430597 -0700
++++ astrometry.net-0.43/blind/Makefile	2013-06-13 17:09:54.247653801 -0700
+@@ -56,7 +56,7 @@
+ LDFLAGS += -fPIC
+ 
+ LDLIBS := $(LDLIBS_DEF)
+-LDLIBS += -lm
++LDLIBS += -lm $(GSL_LIB)
+ 
+ CFLAGS += $(CFLAGS_DEF)
+ CFLAGS += $(ANUTILS_INC)
+@@ -113,7 +113,7 @@
+ PROSPECTUS := quadidx codeprojections quadscales quadsperstar \
+ 	quadcenters startree2rdls
+ 
+-ANLIBS := $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++ANLIBS := $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ BACKEND_LIB := libbackend.a
+ 
+@@ -138,9 +138,9 @@
+ 
+ SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF)
+ 
+-$(BACKEND_SO): $(BACKEND_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
+-		$(QFITS_LIB) $(GSL_LIB)
+-	$(CC) $(SHAREDLIBFLAGS) $^ -o $@
++$(BACKEND_SO): $(BACKEND_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(LIBKD_LIB) \
++		$(QFITS_LIB) 
++	$(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@
+ 
+ # old and miscellaneous executables that aren't part of the pipeline.
+ OLDEXECS := plotquads rawstartree checkquads
+@@ -256,9 +256,9 @@
+ 	done
+ 
+ test-solver: test-solver.o solver_test.o verify.o matchfile.o \
+-		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
++		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) 
+ test-solver-2: test-solver-2.o solver_test_2.o verify.o matchfile.o quad-utils.o codefile.o \
+-		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
++		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) 
+ 
+ NODEP_OBJS += solver_test.o solver_test_2.o
+ ALL_OBJ += test-solver.o test-solver-2.o
+@@ -290,7 +290,7 @@
+ # Add the dependencies here...
+ TEST_DFIND_OBJS := dfind.o
+ ALL_TEST_EXTRA_OBJS += $(TEST_DFIND_OBJS)
+-test_dfind: $(TEST_DFIND_OBJS) $(ANUTILS_LIB) $(GSL_LIB)
++test_dfind: $(TEST_DFIND_OBJS) $(ANUTILS_LIB) 
+ 
+ TEST_CTMF_OBJS := ctmf.o
+ ALL_TEST_EXTRA_OBJS += $(TEST_CTMF_OBJS)
+@@ -302,39 +302,39 @@
+ 
+ test_multiindex2: test_multiindex2.o solver.o verify.o \
+ 	tweak2.o tweak.o matchfile.o matchobj.o quad-utils.o \
+-	$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
++	$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) 
+ ALL_TEST_EXTRA_OBJS += solver.o verify.o tweak2.o tweak.o quad-utils.o
+ 
+ #../util/cutest.o \
+ 
+-test_2mass: 2mass.o 2mass-fits.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++test_2mass: 2mass.o 2mass-fits.o $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_TEST_EXTRA_OBJS += 2mass-fits.o 2mass.o
+ 
+-test_usnob: usnob-fits.o usnob.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++test_usnob: usnob-fits.o usnob.o $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_TEST_EXTRA_OBJS += usnob-fits.o usnob.o
+ 
+-test_nomad: nomad-fits.o nomad.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++test_nomad: nomad-fits.o nomad.o $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_TEST_EXTRA_OBJS += nomad-fits.o nomad.o
+ 
+-test_matchfile: matchfile.o matchobj.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++test_matchfile: matchfile.o matchobj.o $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_TEST_EXTRA_OBJS += matchfile.o matchobj.o
+ 
+-test_blindutils: blindutils.o $(ANUTILS_LIB) $(GSL_LIB)
++test_blindutils: blindutils.o $(ANUTILS_LIB) 
+ ALL_TEST_EXTRA_OBJS += blindutils.o
+ 
+ test_dcen3x3: dcen3x3.o
+ ALL_TEST_EXTRA_OBJS += dcen3x3.o
+ 
+-test_simplexy: $(SIMPLEXY_OBJ) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++test_simplexy: $(SIMPLEXY_OBJ) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_TEST_EXTRA_OBJS += $(SIMPLEXY_OBJ)
+ 
+-test_resort-xylist: resort-xylist.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++test_resort-xylist: resort-xylist.o $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_TEST_EXTRA_OBJS += resort-xylist.o
+ 
+-test_tweak: test_tweak.o tweak.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++test_tweak: test_tweak.o tweak.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_TEST_EXTRA_OBJS += tweak.o
+ 
+-ALL_TEST_LIBS += $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
++ALL_TEST_LIBS += $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB) 
+ 
+ include $(COMMON)/makefile.tests
+ 
+@@ -349,43 +349,43 @@
+ ######################################################
+ 
+ demo_dsmooth: demo_dsmooth.o dsmooth.o \
+-	$(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
+-	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -pg $(LDLIBS) -o $@
++	$(COMMON)/cairoutils.o $(ANUTILS_LIB)  $(QFITS_LIB) 
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -pg $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ control-program: control-program.o \
+ 		$(BACKEND_OBJS) $(SIMPLEXY_OBJ) \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
++		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) 
+ ALL_OBJ += control-program.o
+ 
+ # qfits is only needed for writing debugging images...
+-image2xy: image2xy-main.o image2xy-files.o $(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@
++image2xy: image2xy-main.o image2xy-files.o $(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ ALL_OBJ += image2xy-main.o image2xy-files.o
+ 
+-new-wcs: new-wcs-main.o new-wcs.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++new-wcs: new-wcs-main.o new-wcs.o $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ ALL_OBJ += new-wcs-main.o
+ 
+ rdls2hpls: rdls2hpls.o \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ rdlstohealpix: rdlstohealpix.o \
+-		$(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ xylist2fits: xylist2fits.o \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ certifiable: certifiable.o matchfile.o matchobj.o solvedfile.o \
+-		$(UTILS_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTILS_LIB) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ fits-guess-scale: fits-guess-scale-main.o fits-guess-scale.o \
+-		$(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ ALL_OBJ += fits-guess-scale-main.o
+ 
+ get-wcs: get-wcs.o \
+-		$(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ 
+ ifdef WCSTOOLS_EXISTS
+@@ -396,133 +396,133 @@
+ WCS_LIB_DEP :=
+ 
+ wcs-xy2rd: wcs-xy2rd-main.o wcs-xy2rd.o $(UTIL_OBJS) \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@
++		$(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB) $(WCS_LIB_DEP)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += wcs-xy2rd-main.o
+ 
+ wcs-rd2xy: wcs-rd2xy-main.o wcs-rd2xy.o $(UTIL_OBJS) \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@
++		$(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB) $(WCS_LIB_DEP)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += wcs-rd2xy-main.o
+ 
+ wcs-pv2sip: wcs-pv2sip.o tweak.o \
+-		$(ANLIBS) $(GSL_LIB)
++		$(ANLIBS) 
+ ALL_OBJ += wcs-pv2sip.o
+ 
+-hpgrid: hpgrid.o $(ANUTILS_LIB) $(GSL_LIB)
++hpgrid: hpgrid.o $(ANUTILS_LIB) 
+ 
+ $(CFITS_UTILS) :: %: %.o $(CFITS_DEP)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ fitsverify: ftverify.c fvrf_data.c fvrf_file.c fvrf_head.c fvrf_key.c fvrf_misc.c $(CFITS_DEP)
+ 	$(CC) -DSTANDALONE -trigraphs $(CFITS_INC) $^ $(CFITS_LIB) -lm -o $@
+ 
+ $(OLDEXECS) :: %: %.o $(OLDEXECS_OBJS) \
+-		$(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) $(QFITS_LIB)
++		$(ANUTILS_LIB)  $(LIBKD_LIB) $(QFITS_LIB)
+ 
+-catalog_analysis: catalog_analysis.o pnpoly.o $(ANUTILS_LIB) $(GSL_LIB)
++catalog_analysis: catalog_analysis.o pnpoly.o $(ANUTILS_LIB) 
+ 
+ nomadtofits: nomadtofits.o nomad-fits.o nomad.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ ucac3tofits: ucac3tofits.o ucac3-fits.o ucac3.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $^ $(LDFLAGS) -lbz2 $(LDLIBS) -o $@
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $^ $(LDFLAGS) -lbz2 $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ read_nomad: read_nomad.o nomad.o
+ 
+-2masstofits: $(2MASSOBJ) $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(ZLIB_LIB) $(LDLIBS) -o $@
++2masstofits: $(2MASSOBJ) $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(ZLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ diffractionFlag_check: diffractionFlag_check.o usnob-fits.o usnob.o \
+-		$(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ project-usnob: project-usnob.o usnob-fits.o usnob.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ usnobtofits: usnobtofits.o usnob-fits.o usnob.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+-hpowned: hpowned.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++hpowned: hpowned.o $(UTIL_OBJS) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ build-an-catalog: build-an-catalog.o usnob-fits.o usnob.o \
+ 		2mass-fits.o 2mass.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ cut-an: cut-an.o catalog.o usnob.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ startree: startree.o catalog.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ startree2: startree2-main.o startree2.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_OBJ += startree2-main.o startree2.o
+ 
+ uniformize-catalog: uniformize-catalog-main.o uniformize-catalog.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_OBJ += uniformize-catalog-main.o uniformize-catalog.o
+ 
+ build-index: build-index-main.o build-index.o uniformize-catalog.o startree2.o hpquads.o \
+ 		quad-builder.o quad-utils.o codefile.o codetree.o unpermute-stars.o \
+ 		unpermute-quads.o merge-index.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_OBJ += build-index-main.o build-index.o uniformize-catalog.o quad-utils.o
+ 
+ hpquads: hpquads-main.o hpquads.o quad-builder.o quad-utils.o codefile.o pnpoly.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_OBJ += hpquads-main.o quad-builder.o hpquads.o
+ 
+ allquads: allquads-main.o allquads.o quad-builder.o quad-utils.o codefile.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ codetree: codetree-main.o codetree.o codefile.o quad-utils.o \
+-		$(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_OBJ += codetree-main.o
+ 
+ unpermute-stars: unpermute-stars-main.o unpermute-stars.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_OBJ += unpermute-stars-main.o
+ 
+ unpermute-quads: unpermute-quads-main.o unpermute-quads.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_OBJ += unpermute-quads-main.o
+ 
+ merge-index: merge-index-main.o merge-index.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ ALL_OBJ += merge-index-main.o
+ 
+ local-index: local-index.o build-index.o codetree.o startree2.o codetree.o \
+ 		hpquads.o uniformize-catalog.o merge-index.o unpermute-quads.o unpermute-stars.o \
+ 		quad-builder.o quad-utils.o codefile.o wcs-xy2rd.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(LDLIBS) -o $@
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += local-index.o
+ 
+ index-to-table: index-to-table.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ threadtest: threadtest.o $(BACKEND_LIB) \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
++		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) 
+ 
+ backend: backend-main.o $(BACKEND_LIB) \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
++		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) 
+ ### TWEAK_DEBUG_PLOTS
+ #backend: backend-main.o $(BACKEND_LIB) \
+-#		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) \
++#		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB)  \
+ #		$(PLOTSTUFF) $(COMMON)/cairoutils.o
+ #	$(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB)
+ 
+ verify: verify-main.o verify.o verify2.o matchfile.o matchobj.o $(PLOTSTUFF) $(COMMON)/cairoutils.o \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
++		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) 
+ 	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -o $@
+ 
+ keirthing: keirthing.o tweak.o \
+-		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
++		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) 
+ 
+ dstnthing: dstnthing.o tweak2.o tweak.o matchfile.o matchobj.o verify.o scamp.o $(PLOTSTUFF) \
+-		$(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) 
+-	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
++		$(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB)  
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += dstnthing.o
+ 
+ ALL_OBJ += verify-main.o
+@@ -531,15 +531,15 @@
+ 		image2xy-files.o resort-xylist.o tabsort.o cut-table.o \
+ 		fits-guess-scale.o wcs-rd2xy.o new-wcs.o \
+ 		scamp.o \
+-		$(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(CFITS_LIB) $(LDLIBS) -o $@
++		$(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(CFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ ALL_OBJ += scamp.o cut-table.o
+ 
+ augment-xylist: augment-xylist-main.o augment-xylist.o tabsort.o cut-table.o fits-guess-scale.o \
+ 		image2xy-files.o resort-xylist.o blindutils.o \
+ 		$(SIMPLEXY_OBJ) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(CFITS_DEP)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ ALL_OBJ += augment-xylist-main.o
+ 
+@@ -547,21 +547,21 @@
+ 		solvedclient.o solvedfile.o tweak2.o verify.o \
+ 		tweak.o \
+ 		$(UTIL_OBJS) \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@.tmp
++		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) 
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(GSL_LIB) $(LDLIBS) -o $@.tmp
+ 	mv $@.tmp $@
+ 
+ tweak: tweak-main.o verify.o matchfile.o \
+ 		$(COMMON)/cairoutils.o $(PLOTSTUFF) \
+ 		$(UTIL_OBJS) \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
++		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) 
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ whynot: whynot.o matchfile.o matchobj.o codefile.o solvedclient.o \
+ 		solvedfile.o verify.o quad-utils.o \
+ 		$(PLOTSTUFF) $(COMMON)/cairoutils.o $(CATS_LIB) \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) 
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB)  
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += whynot.o
+ 
+ quadcenters: quadcenters.o \
+@@ -571,36 +571,36 @@
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB)
+ 
+ agreeable: agreeable.o matchfile.o matchobj.o solvedfile.o solvedclient.o verify.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBKD_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB) $(LIBKD_LIB) $(QFITS_LIB)
+ 
+-rdlsinfo: rdlsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++rdlsinfo: rdlsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+-xylsinfo: xylsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++xylsinfo: xylsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ wcsinfo: wcsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) \
+-		$(QFITS_LIB) $(GSL_LIB)
++		$(QFITS_LIB) 
+ 
+-index-info: index-info.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++index-info: index-info.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ subwcs: subwcs.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) \
+-		$(QFITS_LIB) $(GSL_LIB)
++		$(QFITS_LIB) 
+ ALL_OBJS += subwcs.o
+ 
+-wcs-grab: wcs-grab.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) \
++wcs-grab: wcs-grab.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  \
+ 		$(QFITS_LIB)
+ 
+-printsolved: printsolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
++printsolved: printsolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB)  $(QFITS_LIB) 
+ 
+-setsolved: setsolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
++setsolved: setsolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB)  $(QFITS_LIB) 
+ 
+-mergesolved: mergesolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++mergesolved: mergesolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+-solvedserver: solvedserver.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) \
++solvedserver: solvedserver.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB)  \
+ 		$(QFITS_LIB)
+-	$(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ plotcat: plotcat.o 2mass-fits.o 2mass.o nomad-fits.o nomad.o catalog.o usnob-fits.o usnob.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(LIBKD_LIB) \
+ 		$(QFITS_LIB)
+ 
+ plotquad.o: plotquad.c 
+@@ -610,28 +610,28 @@
+ 	$(MAKE) -C $(COMMON) cairoutils.o
+ 
+ onepixel: onepixel.o $(COMMON)/cairoutils.o
+-	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ plotquad: plotquad.o matchfile.o matchobj.o $(COMMON)/cairoutils.o \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
+-	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
++		$(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB) 
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ plot-xy-and-quad: plot-xy-and-quad.o matchfile.o $(COMMON)/cairoutils.o \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) 
+-	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
++		$(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB) 
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ plot-constellations.o: plot-constellations.c
+ 	$(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) $(CATS_INC) -c -o $@ $<
+ 
+ plot-constellations: plot-constellations.o $(CATS_LIB) $(COMMON)/cairoutils.o \
+-		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
++		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ catalog-dists: catalog-dists.o 2mass-fits.o usnob-fits.o usnob.o \
+-		$(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+-add-text: add-text.o $(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
++add-text: add-text.o $(COMMON)/cairoutils.o $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ PYTHON_EXECS := plotann.py
+ PYTHON_INSTALL := $(PYTHON_EXECS)
+@@ -644,8 +644,8 @@
+ plotstuff.o: plotstuff.c
+ 	$(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c -o $@ $<
+ 
+-plotstuff: plotstuff-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
++plotstuff: plotstuff-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += plotstuff-main.o
+ 
+ PLOTSTUFF_SRCS = $(subst .o,.c,$(PLOTSTUFF))
+@@ -662,7 +662,7 @@
+ 
+ _plotstuff_c.so: plotstuff_wrap.c setup.py $(PLOTSTUFF) $(CATS_LIB) \
+ 		$(COMMON)/cairoutils.o \
+-		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 	python setup.py build --force --build-base build --build-platlib build/lib
+ 	cp build/lib/_plotstuff_c.so $@
+ 
+@@ -673,59 +673,59 @@
+ 	$(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c $< -o $@
+ 
+ plotxy: plotxy-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o \
+-		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@
++		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += plotxy-main.o
+ 
+-test_plotstuff: test_plotstuff-main.o test_plotstuff.o $(COMMON)/cutest.o $(PLOTSTUFF) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LDLIBS) -o $@
++test_plotstuff: test_plotstuff-main.o test_plotstuff.o $(COMMON)/cutest.o $(PLOTSTUFF) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ test_plotstuff-main.c: test_plotstuff.c
+ 	$(AN_SHELL) $(MAKE_TESTS) $^ > $@
+ 
+ query-starkd: query-starkd.o $(ANLIBS)
+ ALL_OBJ += query-starkd.o
+ 
+-quadidx: quadidx.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++quadidx: quadidx.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ codeprojections: codeprojections.o $(UTIL_OBJS) $(ANLIBS)
+ 
+ quadscales: quadscales.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(LIBKD_LIB) \
+ 		$(QFITS_LIB)
+ 
+ index-stats: index-stats.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(LIBKD_LIB) \
+ 		$(QFITS_LIB)
+ 
+ quadsperstar: quadsperstar.o \
+-		$(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) \
++		$(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB)  \
+ 		$(QFITS_LIB)
+ 
+-fitsgetext: fitsgetext.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++fitsgetext: fitsgetext.o $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+-fits-dedup: fits-dedup.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++fits-dedup: fits-dedup.o $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+-subtable: subtable.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++subtable: subtable.o $(UTIL_OBJS) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+-tabsort: tabsort-main.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++tabsort: tabsort-main.o $(UTIL_OBJS) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ ALL_OBJ += tabsort-main.o
+ 
+-column-merge: column-merge.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++column-merge: column-merge.o $(UTIL_OBJS) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ resort-xylist: resort-xylist-main.o resort-xylist.o $(UTIL_OBJS) \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ ALL_OBJ += resort-xylist-main.o
+ 
+-bgsubtract: bgsubtract.o ctmf.o $(COMMON)/cairoutils.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
+-	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@
++bgsubtract: bgsubtract.o ctmf.o $(COMMON)/cairoutils.o $(UTIL_OBJS) $(ANUTILS_LIB)  $(QFITS_LIB)
++	$(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@
+ 
+ usnob-scamp-catalog: usnob-scamp-catalog.o usnob-fits.o usnob.o $(UTIL_OBJS) \
+-		$(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ create-scamp-catalog: create-scamp-catalog.o \
+-		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB)
++		$(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB)  $(QFITS_LIB)
+ 
+ DEP_OBJ := $(ALL_OBJ)
+ DEP_PREREQS := $(QFITS_LIB)
+diff -Nur astrometry.net-0.43.as-needed/Makefile astrometry.net-0.43/Makefile
+--- astrometry.net-0.43.as-needed/Makefile	2013-06-13 15:54:15.934430711 -0700
++++ astrometry.net-0.43/Makefile	2013-06-13 15:56:14.795089358 -0700
+@@ -67,7 +67,7 @@
+ 	$(MAKE) -C qfits-an/src
+ 
+ gsl-an:
+-	$(MAKE) -C gsl-an
++	echo "nothing to do"
+ 
+ .PHONY: subdirs thirdparty qfits-an gsl-an
+ 
+diff -Nur astrometry.net-0.43.as-needed/util/Makefile astrometry.net-0.43/util/Makefile
+--- astrometry.net-0.43.as-needed/util/Makefile	2013-06-13 17:05:10.551069687 -0700
++++ astrometry.net-0.43/util/Makefile	2013-06-13 17:10:31.830861262 -0700
+@@ -181,7 +181,7 @@
+ 
+ resample: resample-main.o \
+ 		$(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += resampe.o
+ 
+ tycho2tofits: tycho2tofits.o \
+@@ -194,18 +194,18 @@
+ 
+ _sip.so: sip-utils.o gslutils.o sip.o starutil.o mathutil.o sip_qfits.o \
+ 		fitsioutils.o errors.o ioutils.o bl.o os-features.o an-endian.o \
+-		log.o tic.o $(QFITS_LIB) $(GSL_LIB)
+-	$(CC) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@
++		log.o tic.o $(QFITS_LIB) 
++	$(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@
+ 
+ _healpix.so: healpix-utils.o healpix.o permutedsort.o starutil.o mathutil.o errors.o ioutils.o bl.o log.o tic.o os-features.o
+-	$(CC) $(SHAREDLIBFLAGS) $^ -o $@
++	$(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@
+ 
+ util.py util_wrap.c: util.i $(ANUTILS_H)
+ 	swig -python -I. $<
+ 
+ _util.so: util_wrap.c setup-util.py \
+-		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
+-	WCSLIB_LIB="$(WCSLIB_LIB)" GSL_LIB="$(GSL_LIB)" \
++		$(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) 
++	WCSLIB_LIB="$(WCSLIB_LIB)" GSL_LIB="" \
+ 	python setup-util.py build --force --build-base build --build-platlib build/lib
+ 	cp build/lib/_util.so $@
+ 
+@@ -224,23 +224,23 @@
+ 	cp build/lib/_index_c.so _index_c.so
+ 	cp build/lib/_index_util.so _index_util.so
+ 
+-coadd: coadd-main.o $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) $(WCS_LIB_DEP)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@
++coadd: coadd-main.o $(ANUTILS_LIB) $(QFITS_LIB)  $(WCS_LIB_DEP)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += coadd.o coadd-main.o
+ 
+-wcs-resample: wcs-resample-main.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@
++wcs-resample: wcs-resample-main.o $(ANUTILS_LIB)  $(QFITS_LIB) $(WCS_LIB_DEP)
++	$(CC) $(LDFLAGS) $^ $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += wcs-resample-main.o
+ 
+-fit-wcs: fit-wcs-main.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@
++fit-wcs: fit-wcs-main.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB)  $(QFITS_LIB) $(WCS_LIB_DEP)
++	$(CC) $^ $(LDFLAGS) $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += fit-wcs-main.o
+ 
+-get-healpix: get-healpix.o $(ANUTILS_LIB) $(GSL_LIB)
++get-healpix: get-healpix.o $(ANUTILS_LIB) 
+ ALL_OBJ += get-healpix.o
+ 
+-wcs-to-tan: wcs-to-tan.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP)
+-	$(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@
++wcs-to-tan: wcs-to-tan.o $(ANUTILS_LIB)  $(QFITS_LIB) $(WCS_LIB_DEP)
++	$(CC) $^ $(LDFLAGS) $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@
+ ALL_OBJ += wcs-to-tan.o
+ 
+ pad-file: pad-file.o $(ANUTILS_LIB)
+@@ -482,7 +482,7 @@
+ 	test_convolve_image test_qsort_r test_wcs test_big_tables
+ # test_hd depends on hd.fits...
+ ALL_TEST_EXTRA_OBJS = 
+-ALL_TEST_LIBS = $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
++ALL_TEST_LIBS = $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) 
+ ALL_TEST_EXTRA_LDFLAGS = $(WCSLIB_LIB)
+ 
+ include $(COMMON)/makefile.tests
+@@ -499,12 +499,12 @@
+ 
+ test_errors: $(ANUTILS_LIB)
+ 
+-test_sip-utils: $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
++test_sip-utils: $(ANUTILS_LIB) $(QFITS_LIB) 
+ 
+-test_anwcs: $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
++test_anwcs: $(ANUTILS_LIB) $(QFITS_LIB) 
+ 	$(CC)$(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) -o $@
+ 
+-test_wcs: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB)
++test_wcs: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) 
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) -o $@
+ 
+ test_tycho2: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB)
+@@ -537,7 +537,7 @@
+ 
+ test_starutil: $(ANUTILS_LIB)
+ 
+-test_svd: $(ANUTILS_LIB) $(GSL_LIB)
++test_svd: $(ANUTILS_LIB) 
+ 
+ ### /TESTS
+ 
+diff -Nur astrometry.net-0.43.as-needed/util/makefile.gsl astrometry.net-0.43/util/makefile.gsl
+--- astrometry.net-0.43.as-needed/util/makefile.gsl	2013-06-13 15:54:15.937430729 -0700
++++ astrometry.net-0.43/util/makefile.gsl	2013-06-13 15:54:33.183525063 -0700
+@@ -14,10 +14,5 @@
+ # along with the Astrometry.net suite ; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ 
+-GSL_DIR := $(BASEDIR)/gsl-an
+-GSL_INC := -I$(GSL_DIR)
+-GSL_LIB := $(GSL_DIR)/libgsl-an.a
+-
+-$(GSL_LIB):
+-	$(MAKE) -C $(GSL_DIR)
+-
++GSL_INC ?= $(shell pkg-config --cflags gsl 2>/dev/null)
++GSL_LIB ?= $(shell pkg-config --libs gsl 2>/dev/null)
diff --git a/sci-astronomy/astrometry/metadata.xml b/sci-astronomy/astrometry/metadata.xml
index df28cb837..0fa913062 100644
--- a/sci-astronomy/astrometry/metadata.xml
+++ b/sci-astronomy/astrometry/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
-  <longdescription lang="en">
+<herd>sci-astronomy</herd>
+<longdescription lang="en">
   If you have astronomical imaging of the sky with celestial
   coordinates you do not know—or do not trust—then Astrometry.net is
   for you. Input an image and we'll give you back astrometric
author	Sébastien Fabbro <bicatali@gentoo.org>	2013-06-13 17:41:38 -0700
committer	Sébastien Fabbro <bicatali@gentoo.org>	2013-06-13 17:41:38 -0700
commit	2854e529e9fe64dd648fdb3a16e2ebe2d6aa231e (patch)
tree	75e8be0a78f907cb4a09cf304590c2b6488360d4 /sci-astronomy/astrometry
parent	manifests fixes (diff)
download	sci-2854e529e9fe64dd648fdb3a16e2ebe2d6aa231e.tar.gz sci-2854e529e9fe64dd648fdb3a16e2ebe2d6aa231e.tar.bz2 sci-2854e529e9fe64dd648fdb3a16e2ebe2d6aa231e.zip