| 1 |
commit: 3c177214d2e3841c02ce23c0636842c9a9a38b7c |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 2 21:18:33 2016 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 2 21:18:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3c177214 |
| 7 |
|
| 8 |
sci-astronomy/astrometry: now in main tree |
| 9 |
|
| 10 |
sci-astronomy/astrometry/astrometry-0.43.ebuild | 95 --- |
| 11 |
.../astrometry/files/0.43-as-needed.patch | 366 ---------- |
| 12 |
.../astrometry/files/0.43-respect-user-flags.patch | 14 - |
| 13 |
.../astrometry/files/0.43-system-libs.patch | 742 --------------------- |
| 14 |
sci-astronomy/astrometry/metadata.xml | 18 - |
| 15 |
5 files changed, 1235 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-astronomy/astrometry/astrometry-0.43.ebuild b/sci-astronomy/astrometry/astrometry-0.43.ebuild |
| 18 |
deleted file mode 100644 |
| 19 |
index 90f4fc8..0000000 |
| 20 |
--- a/sci-astronomy/astrometry/astrometry-0.43.ebuild |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,95 +0,0 @@ |
| 23 |
-# Copyright 1999-2015 Gentoo Foundation |
| 24 |
-# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Id$ |
| 26 |
- |
| 27 |
-EAPI=5 |
| 28 |
- |
| 29 |
-PYTHON_COMPAT=( python2_7 ) |
| 30 |
- |
| 31 |
-inherit eutils toolchain-funcs python-single-r1 |
| 32 |
- |
| 33 |
-MYP=${PN}.net-${PV} |
| 34 |
- |
| 35 |
-DESCRIPTION="Automated astrometric calibration programs and service" |
| 36 |
-HOMEPAGE="http://astrometry.net/" |
| 37 |
-SRC_URI="${HOMEPAGE}/downloads/${MYP}.tar.bz2" |
| 38 |
- |
| 39 |
-LICENSE="GPL-2" |
| 40 |
-SLOT="0" |
| 41 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 42 |
-IUSE="examples extra python" |
| 43 |
- |
| 44 |
-RDEPEND=" |
| 45 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 46 |
- sci-astronomy/wcslib |
| 47 |
- sci-libs/cfitsio |
| 48 |
- sci-libs/gsl |
| 49 |
- sys-libs/zlib |
| 50 |
- dev-python/pyfits[${PYTHON_USEDEP}] |
| 51 |
- extra? ( |
| 52 |
- media-libs/libpng:0 |
| 53 |
- media-libs/netpbm |
| 54 |
- virtual/jpeg:0 |
| 55 |
- x11-libs/cairo )" |
| 56 |
-DEPEND="${RDEPEND} |
| 57 |
- dev-lang/swig:0 |
| 58 |
- virtual/pkgconfig" |
| 59 |
- |
| 60 |
-S="${WORKDIR}/${MYP}" |
| 61 |
- |
| 62 |
-src_prepare() { |
| 63 |
- epatch \ |
| 64 |
- "${FILESDIR}"/0.43-as-needed.patch \ |
| 65 |
- "${FILESDIR}"/0.43-respect-user-flags.patch \ |
| 66 |
- "${FILESDIR}"/0.43-system-libs.patch |
| 67 |
- |
| 68 |
- python_fix_shebang "${S}" |
| 69 |
- sed "s|python setup-util.py|${EPYTHON} setup-util.py|" "${S}"/util/Makefile -i || die |
| 70 |
- sed "s|python setup.py|${EPYTHON} setup.py|" "${S}"/{libkd,sdss,blind}/Makefile -i || die |
| 71 |
- sed "s|python -c|${EPYTHON} -c|" "${S}"/blind/Makefile -i || die |
| 72 |
- sed "s|python <<EOF|${EPYTHON} <<EOF|" "${S}"/blind/simplexy.c -i || die |
| 73 |
- sed "s|python -V|${EPYTHON} -V|" "${S}"/Makefile -i || die |
| 74 |
-} |
| 75 |
- |
| 76 |
-src_compile() { |
| 77 |
- emake \ |
| 78 |
- CC=$(tc-getCC) \ |
| 79 |
- RANLIB=$(tc-getRANLIB) \ |
| 80 |
- AR=$(tc-getAR) \ |
| 81 |
- all report.txt |
| 82 |
- if use extra; then |
| 83 |
- emake \ |
| 84 |
- CC=$(tc-getCC) \ |
| 85 |
- RANLIB=$(tc-getRANLIB) \ |
| 86 |
- AR=$(tc-getAR) \ |
| 87 |
- extra |
| 88 |
- fi |
| 89 |
- |
| 90 |
- if use python; then |
| 91 |
- emake \ |
| 92 |
- CC=$(tc-getCC) \ |
| 93 |
- RANLIB=$(tc-getRANLIB) \ |
| 94 |
- AR=$(tc-getAR) \ |
| 95 |
- py |
| 96 |
- fi |
| 97 |
-} |
| 98 |
- |
| 99 |
-src_install() { |
| 100 |
- # TODO: install in standard directories to respect FHS |
| 101 |
- export INSTALL_DIR="${ED}"/usr/astrometry |
| 102 |
- emake install-core |
| 103 |
- use extra && emake -C blind install-extra |
| 104 |
- |
| 105 |
- # remove cfitsio duplicates |
| 106 |
- rm ${INSTALL_DIR}/bin/{fitscopy,imcopy,listhead} || die |
| 107 |
- |
| 108 |
- # remove license file |
| 109 |
- rm ${INSTALL_DIR}/doc/LICENSE || die |
| 110 |
- dodoc ${INSTALL_DIR}/doc/* |
| 111 |
- rm -r ${INSTALL_DIR}/doc || die |
| 112 |
- if use examples; then |
| 113 |
- mv ${INSTALL_DIR}/examples "${ED}"/usr/share/doc/${PF} || die |
| 114 |
- else |
| 115 |
- rm -r ${INSTALL_DIR}/examples || die |
| 116 |
- fi |
| 117 |
-} |
| 118 |
|
| 119 |
diff --git a/sci-astronomy/astrometry/files/0.43-as-needed.patch b/sci-astronomy/astrometry/files/0.43-as-needed.patch |
| 120 |
deleted file mode 100644 |
| 121 |
index 244713d..0000000 |
| 122 |
--- a/sci-astronomy/astrometry/files/0.43-as-needed.patch |
| 123 |
+++ /dev/null |
| 124 |
@@ -1,366 +0,0 @@ |
| 125 |
-Make it work when linking with -Wl,--as-needed |
| 126 |
-See http://www.gentoo.org/proj/en/qa/asneeded.xml |
| 127 |
-bicatali@g.o - 06/2013 |
| 128 |
- |
| 129 |
-diff -Nur astrometry.net-0.43.orig/blind/Makefile astrometry.net-0.43/blind/Makefile |
| 130 |
---- astrometry.net-0.43.orig/blind/Makefile 2013-03-01 12:29:34.000000000 -0800 |
| 131 |
-+++ astrometry.net-0.43/blind/Makefile 2013-06-13 15:54:15.915430597 -0700 |
| 132 |
-@@ -140,7 +140,7 @@ |
| 133 |
- |
| 134 |
- $(BACKEND_SO): $(BACKEND_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \ |
| 135 |
- $(QFITS_LIB) $(GSL_LIB) |
| 136 |
-- $(CC) $(SHAREDLIBFLAGS) -o $@ $^ |
| 137 |
-+ $(CC) $(SHAREDLIBFLAGS) $^ -o $@ |
| 138 |
- |
| 139 |
- # old and miscellaneous executables that aren't part of the pipeline. |
| 140 |
- OLDEXECS := plotquads rawstartree checkquads |
| 141 |
-@@ -350,7 +350,7 @@ |
| 142 |
- |
| 143 |
- demo_dsmooth: demo_dsmooth.o dsmooth.o \ |
| 144 |
- $(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 145 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -pg $(LDLIBS) |
| 146 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -pg $(LDLIBS) -o $@ |
| 147 |
- |
| 148 |
- control-program: control-program.o \ |
| 149 |
- $(BACKEND_OBJS) $(SIMPLEXY_OBJ) \ |
| 150 |
-@@ -359,7 +359,7 @@ |
| 151 |
- |
| 152 |
- # qfits is only needed for writing debugging images... |
| 153 |
- image2xy: image2xy-main.o image2xy-files.o $(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 154 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) |
| 155 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@ |
| 156 |
- |
| 157 |
- ALL_OBJ += image2xy-main.o image2xy-files.o |
| 158 |
- |
| 159 |
-@@ -397,12 +397,12 @@ |
| 160 |
- |
| 161 |
- wcs-xy2rd: wcs-xy2rd-main.o wcs-xy2rd.o $(UTIL_OBJS) \ |
| 162 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 163 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) |
| 164 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@ |
| 165 |
- ALL_OBJ += wcs-xy2rd-main.o |
| 166 |
- |
| 167 |
- wcs-rd2xy: wcs-rd2xy-main.o wcs-rd2xy.o $(UTIL_OBJS) \ |
| 168 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 169 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) |
| 170 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@ |
| 171 |
- ALL_OBJ += wcs-rd2xy-main.o |
| 172 |
- |
| 173 |
- wcs-pv2sip: wcs-pv2sip.o tweak.o \ |
| 174 |
-@@ -412,10 +412,10 @@ |
| 175 |
- hpgrid: hpgrid.o $(ANUTILS_LIB) $(GSL_LIB) |
| 176 |
- |
| 177 |
- $(CFITS_UTILS) :: %: %.o $(CFITS_DEP) |
| 178 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) |
| 179 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@ |
| 180 |
- |
| 181 |
- fitsverify: ftverify.c fvrf_data.c fvrf_file.c fvrf_head.c fvrf_key.c fvrf_misc.c $(CFITS_DEP) |
| 182 |
-- $(CC) -DSTANDALONE -trigraphs $(CFITS_INC) -o $@ $^ $(CFITS_LIB) -lm |
| 183 |
-+ $(CC) -DSTANDALONE -trigraphs $(CFITS_INC) $^ $(CFITS_LIB) -lm -o $@ |
| 184 |
- |
| 185 |
- $(OLDEXECS) :: %: %.o $(OLDEXECS_OBJS) \ |
| 186 |
- $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 187 |
-@@ -427,12 +427,12 @@ |
| 188 |
- |
| 189 |
- ucac3tofits: ucac3tofits.o ucac3-fits.o ucac3.o \ |
| 190 |
- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 191 |
-- $(CC) -o $@ $^ $(LDFLAGS) -lbz2 $(LDLIBS) |
| 192 |
-+ $(CC) $^ $(LDFLAGS) -lbz2 $(LDLIBS) -o $@ |
| 193 |
- |
| 194 |
- read_nomad: read_nomad.o nomad.o |
| 195 |
- |
| 196 |
- 2masstofits: $(2MASSOBJ) $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 197 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ZLIB_LIB) $(LDLIBS) |
| 198 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(ZLIB_LIB) $(LDLIBS) -o $@ |
| 199 |
- |
| 200 |
- diffractionFlag_check: diffractionFlag_check.o usnob-fits.o usnob.o \ |
| 201 |
- $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 202 |
-@@ -496,7 +496,7 @@ |
| 203 |
- hpquads.o uniformize-catalog.o merge-index.o unpermute-quads.o unpermute-stars.o \ |
| 204 |
- quad-builder.o quad-utils.o codefile.o wcs-xy2rd.o \ |
| 205 |
- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 206 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(LDLIBS) |
| 207 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 208 |
- ALL_OBJ += local-index.o |
| 209 |
- |
| 210 |
- index-to-table: index-to-table.o \ |
| 211 |
-@@ -515,14 +515,14 @@ |
| 212 |
- |
| 213 |
- verify: verify-main.o verify.o verify2.o matchfile.o matchobj.o $(PLOTSTUFF) $(COMMON)/cairoutils.o \ |
| 214 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 215 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) |
| 216 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -o $@ |
| 217 |
- |
| 218 |
- keirthing: keirthing.o tweak.o \ |
| 219 |
- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 220 |
- |
| 221 |
- dstnthing: dstnthing.o tweak2.o tweak.o matchfile.o matchobj.o verify.o scamp.o $(PLOTSTUFF) \ |
| 222 |
- $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 223 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) |
| 224 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 225 |
- ALL_OBJ += dstnthing.o |
| 226 |
- |
| 227 |
- ALL_OBJ += verify-main.o |
| 228 |
-@@ -532,14 +532,14 @@ |
| 229 |
- fits-guess-scale.o wcs-rd2xy.o new-wcs.o \ |
| 230 |
- scamp.o \ |
| 231 |
- $(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 232 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(CFITS_LIB) $(LDLIBS) |
| 233 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(CFITS_LIB) $(LDLIBS) -o $@ |
| 234 |
- |
| 235 |
- ALL_OBJ += scamp.o cut-table.o |
| 236 |
- |
| 237 |
- augment-xylist: augment-xylist-main.o augment-xylist.o tabsort.o cut-table.o fits-guess-scale.o \ |
| 238 |
- image2xy-files.o resort-xylist.o blindutils.o \ |
| 239 |
- $(SIMPLEXY_OBJ) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(CFITS_DEP) |
| 240 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) |
| 241 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@ |
| 242 |
- |
| 243 |
- ALL_OBJ += augment-xylist-main.o |
| 244 |
- |
| 245 |
-@@ -548,20 +548,20 @@ |
| 246 |
- tweak.o \ |
| 247 |
- $(UTIL_OBJS) \ |
| 248 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 249 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@.tmp $^ $(LDLIBS) |
| 250 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@.tmp |
| 251 |
- mv $@.tmp $@ |
| 252 |
- |
| 253 |
- tweak: tweak-main.o verify.o matchfile.o \ |
| 254 |
- $(COMMON)/cairoutils.o $(PLOTSTUFF) \ |
| 255 |
- $(UTIL_OBJS) \ |
| 256 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 257 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) |
| 258 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 259 |
- |
| 260 |
- whynot: whynot.o matchfile.o matchobj.o codefile.o solvedclient.o \ |
| 261 |
- solvedfile.o verify.o quad-utils.o \ |
| 262 |
- $(PLOTSTUFF) $(COMMON)/cairoutils.o $(CATS_LIB) \ |
| 263 |
- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 264 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) |
| 265 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 266 |
- ALL_OBJ += whynot.o |
| 267 |
- |
| 268 |
- quadcenters: quadcenters.o \ |
| 269 |
-@@ -597,7 +597,7 @@ |
| 270 |
- |
| 271 |
- solvedserver: solvedserver.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) \ |
| 272 |
- $(QFITS_LIB) |
| 273 |
-- $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) |
| 274 |
-+ $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@ |
| 275 |
- |
| 276 |
- plotcat: plotcat.o 2mass-fits.o 2mass.o nomad-fits.o nomad.o catalog.o usnob-fits.o usnob.o \ |
| 277 |
- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \ |
| 278 |
-@@ -610,28 +610,28 @@ |
| 279 |
- $(MAKE) -C $(COMMON) cairoutils.o |
| 280 |
- |
| 281 |
- onepixel: onepixel.o $(COMMON)/cairoutils.o |
| 282 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) |
| 283 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 284 |
- |
| 285 |
- plotquad: plotquad.o matchfile.o matchobj.o $(COMMON)/cairoutils.o \ |
| 286 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 287 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) |
| 288 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 289 |
- |
| 290 |
- plot-xy-and-quad: plot-xy-and-quad.o matchfile.o $(COMMON)/cairoutils.o \ |
| 291 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 292 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) |
| 293 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 294 |
- |
| 295 |
- plot-constellations.o: plot-constellations.c |
| 296 |
- $(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) $(CATS_INC) -c -o $@ $< |
| 297 |
- |
| 298 |
- plot-constellations: plot-constellations.o $(CATS_LIB) $(COMMON)/cairoutils.o \ |
| 299 |
- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 300 |
-- $(CC) $(LDFLAGS) $^ -o $@ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) |
| 301 |
-+ $(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 302 |
- |
| 303 |
- catalog-dists: catalog-dists.o 2mass-fits.o usnob-fits.o usnob.o \ |
| 304 |
- $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 305 |
- |
| 306 |
- add-text: add-text.o $(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 307 |
-- $(CC) $(LDFLAGS) $^ -o $@ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) |
| 308 |
-+ $(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 309 |
- |
| 310 |
- PYTHON_EXECS := plotann.py |
| 311 |
- PYTHON_INSTALL := $(PYTHON_EXECS) |
| 312 |
-@@ -645,7 +645,7 @@ |
| 313 |
- $(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c -o $@ $< |
| 314 |
- |
| 315 |
- plotstuff: plotstuff-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 316 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) |
| 317 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 318 |
- ALL_OBJ += plotstuff-main.o |
| 319 |
- |
| 320 |
- PLOTSTUFF_SRCS = $(subst .o,.c,$(PLOTSTUFF)) |
| 321 |
-@@ -674,11 +674,11 @@ |
| 322 |
- |
| 323 |
- plotxy: plotxy-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o \ |
| 324 |
- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 325 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) |
| 326 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 327 |
- ALL_OBJ += plotxy-main.o |
| 328 |
- |
| 329 |
- test_plotstuff: test_plotstuff-main.o test_plotstuff.o $(COMMON)/cutest.o $(PLOTSTUFF) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 330 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LDLIBS) |
| 331 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LDLIBS) -o $@ |
| 332 |
- test_plotstuff-main.c: test_plotstuff.c |
| 333 |
- $(AN_SHELL) $(MAKE_TESTS) $^ > $@ |
| 334 |
- |
| 335 |
-@@ -719,7 +719,7 @@ |
| 336 |
- ALL_OBJ += resort-xylist-main.o |
| 337 |
- |
| 338 |
- bgsubtract: bgsubtract.o ctmf.o $(COMMON)/cairoutils.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 339 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) |
| 340 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 341 |
- |
| 342 |
- usnob-scamp-catalog: usnob-scamp-catalog.o usnob-fits.o usnob.o $(UTIL_OBJS) \ |
| 343 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 344 |
-diff -Nur astrometry.net-0.43.orig/util/Makefile astrometry.net-0.43/util/Makefile |
| 345 |
---- astrometry.net-0.43.orig/util/Makefile 2013-02-18 07:12:36.000000000 -0800 |
| 346 |
-+++ astrometry.net-0.43/util/Makefile 2013-06-13 17:05:10.551069687 -0700 |
| 347 |
-@@ -181,7 +181,7 @@ |
| 348 |
- |
| 349 |
- resample: resample-main.o \ |
| 350 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 351 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) |
| 352 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@ |
| 353 |
- ALL_OBJ += resampe.o |
| 354 |
- |
| 355 |
- tycho2tofits: tycho2tofits.o \ |
| 356 |
-@@ -195,10 +195,10 @@ |
| 357 |
- _sip.so: sip-utils.o gslutils.o sip.o starutil.o mathutil.o sip_qfits.o \ |
| 358 |
- fitsioutils.o errors.o ioutils.o bl.o os-features.o an-endian.o \ |
| 359 |
- log.o tic.o $(QFITS_LIB) $(GSL_LIB) |
| 360 |
-- $(CC) $(SHAREDLIBFLAGS) -o $@ $^ |
| 361 |
-+ $(CC) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@ |
| 362 |
- |
| 363 |
- _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 |
| 364 |
-- $(CC) $(SHAREDLIBFLAGS) -o $@ $^ |
| 365 |
-+ $(CC) $(SHAREDLIBFLAGS) $^ -o $@ |
| 366 |
- |
| 367 |
- util.py util_wrap.c: util.i $(ANUTILS_H) |
| 368 |
- swig -python -I. $< |
| 369 |
-@@ -225,22 +225,22 @@ |
| 370 |
- cp build/lib/_index_util.so _index_util.so |
| 371 |
- |
| 372 |
- coadd: coadd-main.o $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) $(WCS_LIB_DEP) |
| 373 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) |
| 374 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@ |
| 375 |
- ALL_OBJ += coadd.o coadd-main.o |
| 376 |
- |
| 377 |
- wcs-resample: wcs-resample-main.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 378 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) |
| 379 |
-+ $(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@ |
| 380 |
- ALL_OBJ += wcs-resample-main.o |
| 381 |
- |
| 382 |
- fit-wcs: fit-wcs-main.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 383 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) |
| 384 |
-+ $(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@ |
| 385 |
- ALL_OBJ += fit-wcs-main.o |
| 386 |
- |
| 387 |
- get-healpix: get-healpix.o $(ANUTILS_LIB) $(GSL_LIB) |
| 388 |
- ALL_OBJ += get-healpix.o |
| 389 |
- |
| 390 |
- wcs-to-tan: wcs-to-tan.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 391 |
-- $(CC) -o $@ $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) |
| 392 |
-+ $(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@ |
| 393 |
- ALL_OBJ += wcs-to-tan.o |
| 394 |
- |
| 395 |
- pad-file: pad-file.o $(ANUTILS_LIB) |
| 396 |
-@@ -253,7 +253,7 @@ |
| 397 |
- ALL_OBJ += add-healpix-column.o |
| 398 |
- |
| 399 |
- an-pnmtofits: an-pnmtofits.o $(ANUTILS_LIB) $(QFITS_LIB) |
| 400 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) |
| 401 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) -o $@ |
| 402 |
- ALL_OBJ += an-pnmtofits.o |
| 403 |
- |
| 404 |
- downsample-fits: downsample-fits.o $(ANUTILS_LIB) $(QFITS_LIB) |
| 405 |
-@@ -334,32 +334,32 @@ |
| 406 |
- @echo |
| 407 |
- @echo "Testing canonicalize_file_name..." |
| 408 |
- @echo "Testing canonicalize_file_name..." >> os-features.log |
| 409 |
-- (($(CC) -o os-features-test-canonicalize \ |
| 410 |
-- $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ $(LDFLAGS) >> os-features.log && \ |
| 411 |
-+ (($(CC) $(LDFLAGS) \ |
| 412 |
-+ $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ -o os-features-test-canonicalize >> os-features.log && \ |
| 413 |
- ./os-features-test-canonicalize >> os-features.log && \ |
| 414 |
- echo "#define NEED_CANONICALIZE_FILE_NAME 0") \ |
| 415 |
- || echo "#define NEED_CANONICALIZE_FILE_NAME 1") >> $@.tmp |
| 416 |
- @echo |
| 417 |
- @echo "Testing declare qsort_r..." |
| 418 |
- @echo "Testing declare qsort_r..." >> os-features.log |
| 419 |
-- (($(CC) -o os-features-test-declare-qsort \ |
| 420 |
-- $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ $(LDFLAGS) >> os-features.log && \ |
| 421 |
-+ (($(CC) $(LDFLAGS) \ |
| 422 |
-+ $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ -o os-features-test-declare-qsort >> os-features.log && \ |
| 423 |
- ./os-features-test-declare-qsort >> os-features.log && \ |
| 424 |
- echo "#define NEED_DECLARE_QSORT_R 1") \ |
| 425 |
- || echo "#define NEED_DECLARE_QSORT_R 0") >> $@.tmp |
| 426 |
- @echo |
| 427 |
- @echo "Testing qsort_r..." |
| 428 |
- @echo "Testing qsort_r..." >> os-features.log |
| 429 |
-- (($(CC) -o os-features-test-qsort \ |
| 430 |
-- $(CFLAGS) -DTEST_QSORT_R $^ $(LDFLAGS) >> os-features.log && \ |
| 431 |
-+ (($(CC) $(LDFLAGS) \ |
| 432 |
-+ $(CFLAGS) -DTEST_QSORT_R $^ -o os-features-test-qsort >> os-features.log && \ |
| 433 |
- ./os-features-test-qsort >> os-features.log && \ |
| 434 |
- echo "#define NEED_QSORT_R 0") \ |
| 435 |
- || echo "#define NEED_QSORT_R 1") >> $@.tmp |
| 436 |
- @echo |
| 437 |
- @echo "Testing swap qsort_r..." |
| 438 |
- @echo "Testing swap qsort_r..." >> os-features.log |
| 439 |
-- (($(CC) -Werror -o os-features-test-swap-qsort \ |
| 440 |
-- $(CFLAGS) -DTEST_SWAP_QSORT_R $^ $(LDFLAGS) >> os-features.log && \ |
| 441 |
-+ (($(CC) $(LDFLAGS) -Werror \ |
| 442 |
-+ $(CFLAGS) -DTEST_SWAP_QSORT_R $^ -o os-features-test-swap-qsort >> os-features.log && \ |
| 443 |
- ./os-features-test-swap-qsort >> os-features.log && \ |
| 444 |
- echo "#define NEED_SWAP_QSORT_R 0") \ |
| 445 |
- || echo "#define NEED_SWAP_QSORT_R 1") >> $@.tmp |
| 446 |
-@@ -368,8 +368,8 @@ |
| 447 |
- @echo " NETPBM_INC is $(NETPBM_INC_ORIG)" |
| 448 |
- @echo " NETPBM_LIB is $(NETPBM_LIB_ORIG)" |
| 449 |
- @echo "Testing netpbm..." >> os-features.log |
| 450 |
-- (($(CC) -o os-features-test-netpbm \ |
| 451 |
-- $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features.log && \ |
| 452 |
-+ (($(CC) $(LDFLAGS) \ |
| 453 |
-+ $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(NETPBM_LIB_ORIG) -o os-features-test-netpbm >> os-features.log && \ |
| 454 |
- ./os-features-test-netpbm >> os-features.log && \ |
| 455 |
- echo "#define HAVE_NETPBM 1") \ |
| 456 |
- || echo "#define HAVE_NETPBM 0") >> $@.tmp |
| 457 |
-@@ -392,8 +392,8 @@ |
| 458 |
- -rm -f os-features-makefile.log |
| 459 |
- ( \ |
| 460 |
- echo "# This file is generated by util/Makefile."; \ |
| 461 |
-- (($(CC) -o os-features-test-netpbm-make \ |
| 462 |
-- $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \ |
| 463 |
-+ (($(CC) $(LDFLAGS) \ |
| 464 |
-+ $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(NETPBM_LIB_ORIG) -o os-features-test-netpbm-make >> os-features-makefile.log && \ |
| 465 |
- ./os-features-test-netpbm-make >> os-features-makefile.log && \ |
| 466 |
- echo "HAVE_NETPBM := yes") \ |
| 467 |
- || (echo "# Astrometry.net didn't find netpbm; not setting HAVE_NETPBM."; \ |
| 468 |
-@@ -502,10 +502,10 @@ |
| 469 |
- test_sip-utils: $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 470 |
- |
| 471 |
- test_anwcs: $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 472 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) |
| 473 |
-+ $(CC)$(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) -o $@ |
| 474 |
- |
| 475 |
- test_wcs: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 476 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) |
| 477 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) -o $@ |
| 478 |
- |
| 479 |
- test_tycho2: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 480 |
- |
| 481 |
-diff -Nur astrometry.net-0.43.orig/util/makefile.tests astrometry.net-0.43/util/makefile.tests |
| 482 |
---- astrometry.net-0.43.orig/util/makefile.tests 2010-07-16 12:48:05.000000000 -0700 |
| 483 |
-+++ astrometry.net-0.43/util/makefile.tests 2013-06-13 16:24:33.816558534 -0700 |
| 484 |
-@@ -50,5 +50,5 @@ |
| 485 |
- $(AN_SHELL) $(MAKE_TESTS) $(TEST_SOURCES) > $@ |
| 486 |
- |
| 487 |
- test: test.o $(COMMON)/cutest.o $(ALL_TEST_FILES_O) $(sort $(ALL_TEST_EXTRA_OBJS)) $(ALL_TEST_LIBS) |
| 488 |
-- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) |
| 489 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) -o $@ |
| 490 |
- |
| 491 |
|
| 492 |
diff --git a/sci-astronomy/astrometry/files/0.43-respect-user-flags.patch b/sci-astronomy/astrometry/files/0.43-respect-user-flags.patch |
| 493 |
deleted file mode 100644 |
| 494 |
index 49aadab..0000000 |
| 495 |
--- a/sci-astronomy/astrometry/files/0.43-respect-user-flags.patch |
| 496 |
+++ /dev/null |
| 497 |
@@ -1,14 +0,0 @@ |
| 498 |
-Respect user optimization flags |
| 499 |
-bicatali@g.o - 06/2013 |
| 500 |
- |
| 501 |
---- astrometry.net-0.38.orig/util/makefile.common 2010-08-26 14:43:44.000000000 +0100 |
| 502 |
-+++ astrometry.net-0.38/util/makefile.common 2012-05-09 23:21:10.000000000 +0100 |
| 503 |
-@@ -145,8 +145,6 @@ |
| 504 |
- |
| 505 |
- ifeq ($(OPTIMIZE),yes) |
| 506 |
- # speedy! |
| 507 |
-- FLAGS_DEF += -O3 |
| 508 |
-- FLAGS_DEF += -fomit-frame-pointer |
| 509 |
- # turn off asserts: |
| 510 |
- FLAGS_DEF += -DNDEBUG |
| 511 |
- |
| 512 |
|
| 513 |
diff --git a/sci-astronomy/astrometry/files/0.43-system-libs.patch b/sci-astronomy/astrometry/files/0.43-system-libs.patch |
| 514 |
deleted file mode 100644 |
| 515 |
index dd106b9..0000000 |
| 516 |
--- a/sci-astronomy/astrometry/files/0.43-system-libs.patch |
| 517 |
+++ /dev/null |
| 518 |
@@ -1,742 +0,0 @@ |
| 519 |
-diff -Nur astrometry.net-0.43.as-needed/blind/Makefile astrometry.net-0.43/blind/Makefile |
| 520 |
---- astrometry.net-0.43.as-needed/blind/Makefile 2013-06-14 10:25:20.789175016 -0700 |
| 521 |
-+++ astrometry.net-0.43/blind/Makefile 2013-06-14 10:25:58.643379797 -0700 |
| 522 |
-@@ -56,7 +56,7 @@ |
| 523 |
- LDFLAGS += -fPIC |
| 524 |
- |
| 525 |
- LDLIBS := $(LDLIBS_DEF) |
| 526 |
--LDLIBS += -lm |
| 527 |
-+LDLIBS += -lm $(GSL_LIB) |
| 528 |
- |
| 529 |
- CFLAGS += $(CFLAGS_DEF) |
| 530 |
- CFLAGS += $(ANUTILS_INC) |
| 531 |
-@@ -113,7 +113,7 @@ |
| 532 |
- PROSPECTUS := quadidx codeprojections quadscales quadsperstar \ |
| 533 |
- quadcenters startree2rdls |
| 534 |
- |
| 535 |
--ANLIBS := $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 536 |
-+ANLIBS := $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 537 |
- |
| 538 |
- BACKEND_LIB := libbackend.a |
| 539 |
- |
| 540 |
-@@ -138,9 +138,9 @@ |
| 541 |
- |
| 542 |
- SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF) |
| 543 |
- |
| 544 |
--$(BACKEND_SO): $(BACKEND_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \ |
| 545 |
-- $(QFITS_LIB) $(GSL_LIB) |
| 546 |
-- $(CC) $(SHAREDLIBFLAGS) $^ -o $@ |
| 547 |
-+$(BACKEND_SO): $(BACKEND_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) \ |
| 548 |
-+ $(QFITS_LIB) |
| 549 |
-+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@ |
| 550 |
- |
| 551 |
- # old and miscellaneous executables that aren't part of the pipeline. |
| 552 |
- OLDEXECS := plotquads rawstartree checkquads |
| 553 |
-@@ -256,9 +256,9 @@ |
| 554 |
- done |
| 555 |
- |
| 556 |
- test-solver: test-solver.o solver_test.o verify.o matchfile.o \ |
| 557 |
-- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 558 |
-+ $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 559 |
- test-solver-2: test-solver-2.o solver_test_2.o verify.o matchfile.o quad-utils.o codefile.o \ |
| 560 |
-- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 561 |
-+ $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 562 |
- |
| 563 |
- NODEP_OBJS += solver_test.o solver_test_2.o |
| 564 |
- ALL_OBJ += test-solver.o test-solver-2.o |
| 565 |
-@@ -290,7 +290,7 @@ |
| 566 |
- # Add the dependencies here... |
| 567 |
- TEST_DFIND_OBJS := dfind.o |
| 568 |
- ALL_TEST_EXTRA_OBJS += $(TEST_DFIND_OBJS) |
| 569 |
--test_dfind: $(TEST_DFIND_OBJS) $(ANUTILS_LIB) $(GSL_LIB) |
| 570 |
-+test_dfind: $(TEST_DFIND_OBJS) $(ANUTILS_LIB) |
| 571 |
- |
| 572 |
- TEST_CTMF_OBJS := ctmf.o |
| 573 |
- ALL_TEST_EXTRA_OBJS += $(TEST_CTMF_OBJS) |
| 574 |
-@@ -302,39 +302,39 @@ |
| 575 |
- |
| 576 |
- test_multiindex2: test_multiindex2.o solver.o verify.o \ |
| 577 |
- tweak2.o tweak.o matchfile.o matchobj.o quad-utils.o \ |
| 578 |
-- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 579 |
-+ $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 580 |
- ALL_TEST_EXTRA_OBJS += solver.o verify.o tweak2.o tweak.o quad-utils.o |
| 581 |
- |
| 582 |
- #../util/cutest.o \ |
| 583 |
- |
| 584 |
--test_2mass: 2mass.o 2mass-fits.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 585 |
-+test_2mass: 2mass.o 2mass-fits.o $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 586 |
- ALL_TEST_EXTRA_OBJS += 2mass-fits.o 2mass.o |
| 587 |
- |
| 588 |
--test_usnob: usnob-fits.o usnob.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 589 |
-+test_usnob: usnob-fits.o usnob.o $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 590 |
- ALL_TEST_EXTRA_OBJS += usnob-fits.o usnob.o |
| 591 |
- |
| 592 |
--test_nomad: nomad-fits.o nomad.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 593 |
-+test_nomad: nomad-fits.o nomad.o $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 594 |
- ALL_TEST_EXTRA_OBJS += nomad-fits.o nomad.o |
| 595 |
- |
| 596 |
--test_matchfile: matchfile.o matchobj.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 597 |
-+test_matchfile: matchfile.o matchobj.o $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 598 |
- ALL_TEST_EXTRA_OBJS += matchfile.o matchobj.o |
| 599 |
- |
| 600 |
--test_blindutils: blindutils.o $(ANUTILS_LIB) $(GSL_LIB) |
| 601 |
-+test_blindutils: blindutils.o $(ANUTILS_LIB) |
| 602 |
- ALL_TEST_EXTRA_OBJS += blindutils.o |
| 603 |
- |
| 604 |
- test_dcen3x3: dcen3x3.o |
| 605 |
- ALL_TEST_EXTRA_OBJS += dcen3x3.o |
| 606 |
- |
| 607 |
--test_simplexy: $(SIMPLEXY_OBJ) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 608 |
-+test_simplexy: $(SIMPLEXY_OBJ) $(ANUTILS_LIB) $(QFITS_LIB) |
| 609 |
- ALL_TEST_EXTRA_OBJS += $(SIMPLEXY_OBJ) |
| 610 |
- |
| 611 |
--test_resort-xylist: resort-xylist.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 612 |
-+test_resort-xylist: resort-xylist.o $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 613 |
- ALL_TEST_EXTRA_OBJS += resort-xylist.o |
| 614 |
- |
| 615 |
--test_tweak: test_tweak.o tweak.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 616 |
-+test_tweak: test_tweak.o tweak.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 617 |
- ALL_TEST_EXTRA_OBJS += tweak.o |
| 618 |
- |
| 619 |
--ALL_TEST_LIBS += $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 620 |
-+ALL_TEST_LIBS += $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 621 |
- |
| 622 |
- include $(COMMON)/makefile.tests |
| 623 |
- |
| 624 |
-@@ -349,43 +349,43 @@ |
| 625 |
- ###################################################### |
| 626 |
- |
| 627 |
- demo_dsmooth: demo_dsmooth.o dsmooth.o \ |
| 628 |
-- $(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 629 |
-- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -pg $(LDLIBS) -o $@ |
| 630 |
-+ $(COMMON)/cairoutils.o $(ANUTILS_LIB) $(QFITS_LIB) |
| 631 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -pg $(GSL_LIB) $(LDLIBS) -o $@ |
| 632 |
- |
| 633 |
- control-program: control-program.o \ |
| 634 |
- $(BACKEND_OBJS) $(SIMPLEXY_OBJ) \ |
| 635 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 636 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 637 |
- ALL_OBJ += control-program.o |
| 638 |
- |
| 639 |
- # qfits is only needed for writing debugging images... |
| 640 |
--image2xy: image2xy-main.o image2xy-files.o $(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 641 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@ |
| 642 |
-+image2xy: image2xy-main.o image2xy-files.o $(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANUTILS_LIB) $(QFITS_LIB) |
| 643 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 644 |
- |
| 645 |
- ALL_OBJ += image2xy-main.o image2xy-files.o |
| 646 |
- |
| 647 |
--new-wcs: new-wcs-main.o new-wcs.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 648 |
-+new-wcs: new-wcs-main.o new-wcs.o $(ANUTILS_LIB) $(QFITS_LIB) |
| 649 |
- |
| 650 |
- ALL_OBJ += new-wcs-main.o |
| 651 |
- |
| 652 |
- rdls2hpls: rdls2hpls.o \ |
| 653 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 654 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 655 |
- |
| 656 |
- rdlstohealpix: rdlstohealpix.o \ |
| 657 |
-- $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 658 |
-+ $(ANUTILS_LIB) $(QFITS_LIB) |
| 659 |
- |
| 660 |
- xylist2fits: xylist2fits.o \ |
| 661 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 662 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 663 |
- |
| 664 |
- certifiable: certifiable.o matchfile.o matchobj.o solvedfile.o \ |
| 665 |
-- $(UTILS_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 666 |
-+ $(UTILS_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 667 |
- |
| 668 |
- fits-guess-scale: fits-guess-scale-main.o fits-guess-scale.o \ |
| 669 |
-- $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 670 |
-+ $(ANUTILS_LIB) $(QFITS_LIB) |
| 671 |
- |
| 672 |
- ALL_OBJ += fits-guess-scale-main.o |
| 673 |
- |
| 674 |
- get-wcs: get-wcs.o \ |
| 675 |
-- $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 676 |
-+ $(ANUTILS_LIB) $(QFITS_LIB) |
| 677 |
- |
| 678 |
- |
| 679 |
- ifdef WCSTOOLS_EXISTS |
| 680 |
-@@ -396,133 +396,133 @@ |
| 681 |
- WCS_LIB_DEP := |
| 682 |
- |
| 683 |
- wcs-xy2rd: wcs-xy2rd-main.o wcs-xy2rd.o $(UTIL_OBJS) \ |
| 684 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 685 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@ |
| 686 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 687 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 688 |
- ALL_OBJ += wcs-xy2rd-main.o |
| 689 |
- |
| 690 |
- wcs-rd2xy: wcs-rd2xy-main.o wcs-rd2xy.o $(UTIL_OBJS) \ |
| 691 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 692 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@ |
| 693 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 694 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 695 |
- ALL_OBJ += wcs-rd2xy-main.o |
| 696 |
- |
| 697 |
- wcs-pv2sip: wcs-pv2sip.o tweak.o \ |
| 698 |
-- $(ANLIBS) $(GSL_LIB) |
| 699 |
-+ $(ANLIBS) |
| 700 |
- ALL_OBJ += wcs-pv2sip.o |
| 701 |
- |
| 702 |
--hpgrid: hpgrid.o $(ANUTILS_LIB) $(GSL_LIB) |
| 703 |
-+hpgrid: hpgrid.o $(ANUTILS_LIB) |
| 704 |
- |
| 705 |
- $(CFITS_UTILS) :: %: %.o $(CFITS_DEP) |
| 706 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@ |
| 707 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 708 |
- |
| 709 |
- fitsverify: ftverify.c fvrf_data.c fvrf_file.c fvrf_head.c fvrf_key.c fvrf_misc.c $(CFITS_DEP) |
| 710 |
- $(CC) -DSTANDALONE -trigraphs $(CFITS_INC) $^ $(CFITS_LIB) -lm -o $@ |
| 711 |
- |
| 712 |
- $(OLDEXECS) :: %: %.o $(OLDEXECS_OBJS) \ |
| 713 |
-- $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 714 |
-+ $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 715 |
- |
| 716 |
--catalog_analysis: catalog_analysis.o pnpoly.o $(ANUTILS_LIB) $(GSL_LIB) |
| 717 |
-+catalog_analysis: catalog_analysis.o pnpoly.o $(ANUTILS_LIB) |
| 718 |
- |
| 719 |
- nomadtofits: nomadtofits.o nomad-fits.o nomad.o \ |
| 720 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 721 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 722 |
- |
| 723 |
- ucac3tofits: ucac3tofits.o ucac3-fits.o ucac3.o \ |
| 724 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 725 |
-- $(CC) $^ $(LDFLAGS) -lbz2 $(LDLIBS) -o $@ |
| 726 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 727 |
-+ $(CC) $^ $(LDFLAGS) -lbz2 $(GSL_LIB) $(LDLIBS) -o $@ |
| 728 |
- |
| 729 |
- read_nomad: read_nomad.o nomad.o |
| 730 |
- |
| 731 |
--2masstofits: $(2MASSOBJ) $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 732 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(ZLIB_LIB) $(LDLIBS) -o $@ |
| 733 |
-+2masstofits: $(2MASSOBJ) $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 734 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(ZLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 735 |
- |
| 736 |
- diffractionFlag_check: diffractionFlag_check.o usnob-fits.o usnob.o \ |
| 737 |
-- $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 738 |
-+ $(UTIL_OBJS) $(ANUTILS_LIB) $(QFITS_LIB) |
| 739 |
- |
| 740 |
- project-usnob: project-usnob.o usnob-fits.o usnob.o \ |
| 741 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 742 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 743 |
- |
| 744 |
- usnobtofits: usnobtofits.o usnob-fits.o usnob.o \ |
| 745 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 746 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 747 |
- |
| 748 |
--hpowned: hpowned.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 749 |
-+hpowned: hpowned.o $(UTIL_OBJS) $(ANUTILS_LIB) $(QFITS_LIB) |
| 750 |
- |
| 751 |
- build-an-catalog: build-an-catalog.o usnob-fits.o usnob.o \ |
| 752 |
- 2mass-fits.o 2mass.o \ |
| 753 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 754 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 755 |
- |
| 756 |
- cut-an: cut-an.o catalog.o usnob.o \ |
| 757 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 758 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 759 |
- |
| 760 |
- startree: startree.o catalog.o \ |
| 761 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 762 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 763 |
- |
| 764 |
- startree2: startree2-main.o startree2.o \ |
| 765 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 766 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 767 |
- ALL_OBJ += startree2-main.o startree2.o |
| 768 |
- |
| 769 |
- uniformize-catalog: uniformize-catalog-main.o uniformize-catalog.o \ |
| 770 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 771 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 772 |
- ALL_OBJ += uniformize-catalog-main.o uniformize-catalog.o |
| 773 |
- |
| 774 |
- build-index: build-index-main.o build-index.o uniformize-catalog.o startree2.o hpquads.o \ |
| 775 |
- quad-builder.o quad-utils.o codefile.o codetree.o unpermute-stars.o \ |
| 776 |
- unpermute-quads.o merge-index.o \ |
| 777 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 778 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 779 |
- ALL_OBJ += build-index-main.o build-index.o uniformize-catalog.o quad-utils.o |
| 780 |
- |
| 781 |
- hpquads: hpquads-main.o hpquads.o quad-builder.o quad-utils.o codefile.o pnpoly.o \ |
| 782 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 783 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 784 |
- ALL_OBJ += hpquads-main.o quad-builder.o hpquads.o |
| 785 |
- |
| 786 |
- allquads: allquads-main.o allquads.o quad-builder.o quad-utils.o codefile.o \ |
| 787 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 788 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 789 |
- |
| 790 |
- codetree: codetree-main.o codetree.o codefile.o quad-utils.o \ |
| 791 |
-- $(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 792 |
-+ $(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 793 |
- ALL_OBJ += codetree-main.o |
| 794 |
- |
| 795 |
- unpermute-stars: unpermute-stars-main.o unpermute-stars.o \ |
| 796 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 797 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 798 |
- ALL_OBJ += unpermute-stars-main.o |
| 799 |
- |
| 800 |
- unpermute-quads: unpermute-quads-main.o unpermute-quads.o \ |
| 801 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 802 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 803 |
- ALL_OBJ += unpermute-quads-main.o |
| 804 |
- |
| 805 |
- merge-index: merge-index-main.o merge-index.o \ |
| 806 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 807 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 808 |
- ALL_OBJ += merge-index-main.o |
| 809 |
- |
| 810 |
- local-index: local-index.o build-index.o codetree.o startree2.o codetree.o \ |
| 811 |
- hpquads.o uniformize-catalog.o merge-index.o unpermute-quads.o unpermute-stars.o \ |
| 812 |
- quad-builder.o quad-utils.o codefile.o wcs-xy2rd.o \ |
| 813 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 814 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 815 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 816 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 817 |
- ALL_OBJ += local-index.o |
| 818 |
- |
| 819 |
- index-to-table: index-to-table.o \ |
| 820 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 821 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 822 |
- |
| 823 |
- threadtest: threadtest.o $(BACKEND_LIB) \ |
| 824 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 825 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 826 |
- |
| 827 |
- backend: backend-main.o $(BACKEND_LIB) \ |
| 828 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 829 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 830 |
- ### TWEAK_DEBUG_PLOTS |
| 831 |
- #backend: backend-main.o $(BACKEND_LIB) \ |
| 832 |
--# $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) \ |
| 833 |
-+# $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) \ |
| 834 |
- # $(PLOTSTUFF) $(COMMON)/cairoutils.o |
| 835 |
- # $(CC) -o $@ $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) |
| 836 |
- |
| 837 |
- verify: verify-main.o verify.o verify2.o matchfile.o matchobj.o $(PLOTSTUFF) $(COMMON)/cairoutils.o \ |
| 838 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 839 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 840 |
- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) -o $@ |
| 841 |
- |
| 842 |
- keirthing: keirthing.o tweak.o \ |
| 843 |
-- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 844 |
-+ $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 845 |
- |
| 846 |
- dstnthing: dstnthing.o tweak2.o tweak.o matchfile.o matchobj.o verify.o scamp.o $(PLOTSTUFF) \ |
| 847 |
-- $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 848 |
-- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 849 |
-+ $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 850 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 851 |
- ALL_OBJ += dstnthing.o |
| 852 |
- |
| 853 |
- ALL_OBJ += verify-main.o |
| 854 |
-@@ -531,15 +531,15 @@ |
| 855 |
- image2xy-files.o resort-xylist.o tabsort.o cut-table.o \ |
| 856 |
- fits-guess-scale.o wcs-rd2xy.o new-wcs.o \ |
| 857 |
- scamp.o \ |
| 858 |
-- $(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 859 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(CFITS_LIB) $(LDLIBS) -o $@ |
| 860 |
-+ $(SIMPLEXY_OBJ) $(CFITS_DEP) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 861 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) $(CFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 862 |
- |
| 863 |
- ALL_OBJ += scamp.o cut-table.o |
| 864 |
- |
| 865 |
- augment-xylist: augment-xylist-main.o augment-xylist.o tabsort.o cut-table.o fits-guess-scale.o \ |
| 866 |
- image2xy-files.o resort-xylist.o blindutils.o \ |
| 867 |
- $(SIMPLEXY_OBJ) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(CFITS_DEP) |
| 868 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(LDLIBS) -o $@ |
| 869 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 870 |
- |
| 871 |
- ALL_OBJ += augment-xylist-main.o |
| 872 |
- |
| 873 |
-@@ -547,21 +547,21 @@ |
| 874 |
- solvedclient.o solvedfile.o tweak2.o verify.o \ |
| 875 |
- tweak.o \ |
| 876 |
- $(UTIL_OBJS) \ |
| 877 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 878 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@.tmp |
| 879 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 880 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(GSL_LIB) $(LDLIBS) -o $@.tmp |
| 881 |
- mv $@.tmp $@ |
| 882 |
- |
| 883 |
- tweak: tweak-main.o verify.o matchfile.o \ |
| 884 |
- $(COMMON)/cairoutils.o $(PLOTSTUFF) \ |
| 885 |
- $(UTIL_OBJS) \ |
| 886 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 887 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 888 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 889 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 890 |
- |
| 891 |
- whynot: whynot.o matchfile.o matchobj.o codefile.o solvedclient.o \ |
| 892 |
- solvedfile.o verify.o quad-utils.o \ |
| 893 |
- $(PLOTSTUFF) $(COMMON)/cairoutils.o $(CATS_LIB) \ |
| 894 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 895 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 896 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 897 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 898 |
- ALL_OBJ += whynot.o |
| 899 |
- |
| 900 |
- quadcenters: quadcenters.o \ |
| 901 |
-@@ -571,36 +571,36 @@ |
| 902 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 903 |
- |
| 904 |
- agreeable: agreeable.o matchfile.o matchobj.o solvedfile.o solvedclient.o verify.o \ |
| 905 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 906 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LIBKD_LIB) $(QFITS_LIB) |
| 907 |
- |
| 908 |
--rdlsinfo: rdlsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 909 |
-+rdlsinfo: rdlsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 910 |
- |
| 911 |
--xylsinfo: xylsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 912 |
-+xylsinfo: xylsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 913 |
- |
| 914 |
- wcsinfo: wcsinfo.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) \ |
| 915 |
-- $(QFITS_LIB) $(GSL_LIB) |
| 916 |
-+ $(QFITS_LIB) |
| 917 |
- |
| 918 |
--index-info: index-info.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 919 |
-+index-info: index-info.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 920 |
- |
| 921 |
- subwcs: subwcs.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) \ |
| 922 |
-- $(QFITS_LIB) $(GSL_LIB) |
| 923 |
-+ $(QFITS_LIB) |
| 924 |
- ALL_OBJS += subwcs.o |
| 925 |
- |
| 926 |
--wcs-grab: wcs-grab.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) \ |
| 927 |
-+wcs-grab: wcs-grab.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) \ |
| 928 |
- $(QFITS_LIB) |
| 929 |
- |
| 930 |
--printsolved: printsolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 931 |
-+printsolved: printsolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(QFITS_LIB) |
| 932 |
- |
| 933 |
--setsolved: setsolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 934 |
-+setsolved: setsolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(QFITS_LIB) |
| 935 |
- |
| 936 |
--mergesolved: mergesolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 937 |
-+mergesolved: mergesolved.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(QFITS_LIB) |
| 938 |
- |
| 939 |
--solvedserver: solvedserver.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) \ |
| 940 |
-+solvedserver: solvedserver.o solvedfile.o $(UTIL_OBJS) $(ANUTILS_LIB) \ |
| 941 |
- $(QFITS_LIB) |
| 942 |
-- $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@ |
| 943 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(GSL_LIB) $(LDLIBS) -o $@ |
| 944 |
- |
| 945 |
- plotcat: plotcat.o 2mass-fits.o 2mass.o nomad-fits.o nomad.o catalog.o usnob-fits.o usnob.o \ |
| 946 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \ |
| 947 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) \ |
| 948 |
- $(QFITS_LIB) |
| 949 |
- |
| 950 |
- plotquad.o: plotquad.c |
| 951 |
-@@ -610,28 +610,28 @@ |
| 952 |
- $(MAKE) -C $(COMMON) cairoutils.o |
| 953 |
- |
| 954 |
- onepixel: onepixel.o $(COMMON)/cairoutils.o |
| 955 |
-- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 956 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 957 |
- |
| 958 |
- plotquad: plotquad.o matchfile.o matchobj.o $(COMMON)/cairoutils.o \ |
| 959 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 960 |
-- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 961 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 962 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 963 |
- |
| 964 |
- plot-xy-and-quad: plot-xy-and-quad.o matchfile.o $(COMMON)/cairoutils.o \ |
| 965 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 966 |
-- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 967 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 968 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 969 |
- |
| 970 |
- plot-constellations.o: plot-constellations.c |
| 971 |
- $(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) $(CATS_INC) -c -o $@ $< |
| 972 |
- |
| 973 |
- plot-constellations: plot-constellations.o $(CATS_LIB) $(COMMON)/cairoutils.o \ |
| 974 |
-- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 975 |
-- $(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 976 |
-+ $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 977 |
-+ $(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 978 |
- |
| 979 |
- catalog-dists: catalog-dists.o 2mass-fits.o usnob-fits.o usnob.o \ |
| 980 |
-- $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 981 |
-+ $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 982 |
- |
| 983 |
--add-text: add-text.o $(COMMON)/cairoutils.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 984 |
-- $(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 985 |
-+add-text: add-text.o $(COMMON)/cairoutils.o $(ANUTILS_LIB) $(QFITS_LIB) |
| 986 |
-+ $(CC) $(LDFLAGS) $^ $(CAIRO_LIB) $(NETPBM_LIB) $(PNG_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 987 |
- |
| 988 |
- PYTHON_EXECS := plotann.py |
| 989 |
- PYTHON_INSTALL := $(PYTHON_EXECS) |
| 990 |
-@@ -644,8 +644,8 @@ |
| 991 |
- plotstuff.o: plotstuff.c |
| 992 |
- $(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c -o $@ $< |
| 993 |
- |
| 994 |
--plotstuff: plotstuff-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 995 |
-- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 996 |
-+plotstuff: plotstuff-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 997 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 998 |
- ALL_OBJ += plotstuff-main.o |
| 999 |
- |
| 1000 |
- PLOTSTUFF_SRCS = $(subst .o,.c,$(PLOTSTUFF)) |
| 1001 |
-@@ -662,7 +662,7 @@ |
| 1002 |
- |
| 1003 |
- _plotstuff_c.so: plotstuff_wrap.c setup.py $(PLOTSTUFF) $(CATS_LIB) \ |
| 1004 |
- $(COMMON)/cairoutils.o \ |
| 1005 |
-- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1006 |
-+ $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1007 |
- python setup.py build --force --build-base build --build-platlib build/lib |
| 1008 |
- cp build/lib/_plotstuff_c.so $@ |
| 1009 |
- |
| 1010 |
-@@ -673,59 +673,59 @@ |
| 1011 |
- $(CC) $(CFLAGS) $(CAIRO_INC) $(NETPBM_INC) -c $< -o $@ |
| 1012 |
- |
| 1013 |
- plotxy: plotxy-main.o $(PLOTSTUFF) $(CATS_LIB) $(COMMON)/cairoutils.o \ |
| 1014 |
-- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1015 |
-- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LDLIBS) -o $@ |
| 1016 |
-+ $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1017 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 1018 |
- ALL_OBJ += plotxy-main.o |
| 1019 |
- |
| 1020 |
--test_plotstuff: test_plotstuff-main.o test_plotstuff.o $(COMMON)/cutest.o $(PLOTSTUFF) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1021 |
-- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(LDLIBS) -o $@ |
| 1022 |
-+test_plotstuff: test_plotstuff-main.o test_plotstuff.o $(COMMON)/cutest.o $(PLOTSTUFF) $(COMMON)/cairoutils.o $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1023 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(WCSLIB_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 1024 |
- test_plotstuff-main.c: test_plotstuff.c |
| 1025 |
- $(AN_SHELL) $(MAKE_TESTS) $^ > $@ |
| 1026 |
- |
| 1027 |
- query-starkd: query-starkd.o $(ANLIBS) |
| 1028 |
- ALL_OBJ += query-starkd.o |
| 1029 |
- |
| 1030 |
--quadidx: quadidx.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1031 |
-+quadidx: quadidx.o $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1032 |
- |
| 1033 |
- codeprojections: codeprojections.o $(UTIL_OBJS) $(ANLIBS) |
| 1034 |
- |
| 1035 |
- quadscales: quadscales.o \ |
| 1036 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \ |
| 1037 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) \ |
| 1038 |
- $(QFITS_LIB) |
| 1039 |
- |
| 1040 |
- index-stats: index-stats.o \ |
| 1041 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(LIBKD_LIB) \ |
| 1042 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(LIBKD_LIB) \ |
| 1043 |
- $(QFITS_LIB) |
| 1044 |
- |
| 1045 |
- quadsperstar: quadsperstar.o \ |
| 1046 |
-- $(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) \ |
| 1047 |
-+ $(UTIL_OBJS) $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) \ |
| 1048 |
- $(QFITS_LIB) |
| 1049 |
- |
| 1050 |
--fitsgetext: fitsgetext.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1051 |
-+fitsgetext: fitsgetext.o $(ANUTILS_LIB) $(QFITS_LIB) |
| 1052 |
- |
| 1053 |
--fits-dedup: fits-dedup.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1054 |
-+fits-dedup: fits-dedup.o $(ANUTILS_LIB) $(QFITS_LIB) |
| 1055 |
- |
| 1056 |
--subtable: subtable.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1057 |
-+subtable: subtable.o $(UTIL_OBJS) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1058 |
- |
| 1059 |
--tabsort: tabsort-main.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1060 |
-+tabsort: tabsort-main.o $(UTIL_OBJS) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1061 |
- |
| 1062 |
- ALL_OBJ += tabsort-main.o |
| 1063 |
- |
| 1064 |
--column-merge: column-merge.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1065 |
-+column-merge: column-merge.o $(UTIL_OBJS) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1066 |
- |
| 1067 |
- resort-xylist: resort-xylist-main.o resort-xylist.o $(UTIL_OBJS) \ |
| 1068 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1069 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1070 |
- |
| 1071 |
- ALL_OBJ += resort-xylist-main.o |
| 1072 |
- |
| 1073 |
--bgsubtract: bgsubtract.o ctmf.o $(COMMON)/cairoutils.o $(UTIL_OBJS) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1074 |
-- $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(LDLIBS) -o $@ |
| 1075 |
-+bgsubtract: bgsubtract.o ctmf.o $(COMMON)/cairoutils.o $(UTIL_OBJS) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1076 |
-+ $(CC) $^ $(LDFLAGS) $(CAIRO_LIB) $(PNG_LIB) $(NETPBM_LIB) $(JPEG_LIB) $(GSL_LIB) $(LDLIBS) -o $@ |
| 1077 |
- |
| 1078 |
- usnob-scamp-catalog: usnob-scamp-catalog.o usnob-fits.o usnob.o $(UTIL_OBJS) \ |
| 1079 |
-- $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1080 |
-+ $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1081 |
- |
| 1082 |
- create-scamp-catalog: create-scamp-catalog.o \ |
| 1083 |
-- $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) |
| 1084 |
-+ $(UTIL_OBJS) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1085 |
- |
| 1086 |
- DEP_OBJ := $(ALL_OBJ) |
| 1087 |
- DEP_PREREQS := $(QFITS_LIB) |
| 1088 |
-diff -Nur astrometry.net-0.43.as-needed/blind/setup.py astrometry.net-0.43/blind/setup.py |
| 1089 |
---- astrometry.net-0.43.as-needed/blind/setup.py 2013-06-14 10:25:20.786175152 -0700 |
| 1090 |
-+++ astrometry.net-0.43/blind/setup.py 2013-06-14 10:34:33.657232232 -0700 |
| 1091 |
-@@ -68,9 +68,8 @@ |
| 1092 |
- '../libkd/libkd.a', |
| 1093 |
- '../util/libanutils.a', |
| 1094 |
- '../qfits-an/lib/libqfits.a', |
| 1095 |
-- '../gsl-an/libgsl-an.a', |
| 1096 |
- ], |
| 1097 |
-- libraries=reduce(lambda x,y: x+y, [get_libs(x,req) for x,req in [('cairo',True), ('wcslib',False)]]) + ['jpeg'] + extra_link_libs, |
| 1098 |
-+ libraries=reduce(lambda x,y: x+y, [get_libs(x,req) for x,req in [('cairo',True), ('wcslib',False)]]) + ['jpeg'] + ['gsl'] + extra_link_libs, |
| 1099 |
- library_dirs=reduce(lambda x,y: x+y, [get_lib_dirs(x,req) for x,req in [('cairo',True), ('wcslib',False)]]) + extra_link_dirs, |
| 1100 |
- extra_compile_args=compile_args, |
| 1101 |
- extra_link_args=link_args, |
| 1102 |
-diff -Nur astrometry.net-0.43.as-needed/Makefile astrometry.net-0.43/Makefile |
| 1103 |
---- astrometry.net-0.43.as-needed/Makefile 2013-06-14 10:25:20.809174220 -0700 |
| 1104 |
-+++ astrometry.net-0.43/Makefile 2013-06-14 10:26:38.497600024 -0700 |
| 1105 |
-@@ -67,7 +67,7 @@ |
| 1106 |
- $(MAKE) -C qfits-an/src |
| 1107 |
- |
| 1108 |
- gsl-an: |
| 1109 |
-- $(MAKE) -C gsl-an |
| 1110 |
-+ echo "nothing to do" |
| 1111 |
- |
| 1112 |
- .PHONY: subdirs thirdparty qfits-an gsl-an |
| 1113 |
- |
| 1114 |
-@@ -81,7 +81,6 @@ |
| 1115 |
- # Targets that create python bindings (requiring swig) |
| 1116 |
- py: |
| 1117 |
- $(MAKE) -C qfits-an |
| 1118 |
-- $(MAKE) -C gsl-an |
| 1119 |
- $(MAKE) -C catalogs |
| 1120 |
- $(MAKE) -C util pyutil |
| 1121 |
- $(MAKE) -C util cairoutils.o |
| 1122 |
-@@ -91,7 +90,6 @@ |
| 1123 |
- |
| 1124 |
- pyutil: |
| 1125 |
- $(MAKE) -C qfits-an |
| 1126 |
-- $(MAKE) -C gsl-an |
| 1127 |
- $(MAKE) -C util pyutil |
| 1128 |
- |
| 1129 |
- install: all report.txt |
| 1130 |
-diff -Nur astrometry.net-0.43.as-needed/util/Makefile astrometry.net-0.43/util/Makefile |
| 1131 |
---- astrometry.net-0.43.as-needed/util/Makefile 2013-06-14 10:25:20.813174107 -0700 |
| 1132 |
-+++ astrometry.net-0.43/util/Makefile 2013-06-14 10:30:57.575032667 -0700 |
| 1133 |
-@@ -181,7 +181,7 @@ |
| 1134 |
- |
| 1135 |
- resample: resample-main.o \ |
| 1136 |
- $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 1137 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@ |
| 1138 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@ |
| 1139 |
- ALL_OBJ += resampe.o |
| 1140 |
- |
| 1141 |
- tycho2tofits: tycho2tofits.o \ |
| 1142 |
-@@ -194,17 +194,17 @@ |
| 1143 |
- |
| 1144 |
- _sip.so: sip-utils.o gslutils.o sip.o starutil.o mathutil.o sip_qfits.o \ |
| 1145 |
- fitsioutils.o errors.o ioutils.o bl.o os-features.o an-endian.o \ |
| 1146 |
-- log.o tic.o $(QFITS_LIB) $(GSL_LIB) |
| 1147 |
-- $(CC) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@ |
| 1148 |
-+ log.o tic.o $(QFITS_LIB) |
| 1149 |
-+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@ |
| 1150 |
- |
| 1151 |
- _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 |
| 1152 |
-- $(CC) $(SHAREDLIBFLAGS) $^ -o $@ |
| 1153 |
-+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) $^ $(GSL_LIB) -o $@ |
| 1154 |
- |
| 1155 |
- util.py util_wrap.c: util.i $(ANUTILS_H) |
| 1156 |
- swig -python -I. $< |
| 1157 |
- |
| 1158 |
- _util.so: util_wrap.c setup-util.py \ |
| 1159 |
-- $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 1160 |
-+ $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1161 |
- WCSLIB_LIB="$(WCSLIB_LIB)" GSL_LIB="$(GSL_LIB)" \ |
| 1162 |
- python setup-util.py build --force --build-base build --build-platlib build/lib |
| 1163 |
- cp build/lib/_util.so $@ |
| 1164 |
-@@ -224,23 +224,23 @@ |
| 1165 |
- cp build/lib/_index_c.so _index_c.so |
| 1166 |
- cp build/lib/_index_util.so _index_util.so |
| 1167 |
- |
| 1168 |
--coadd: coadd-main.o $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) $(WCS_LIB_DEP) |
| 1169 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCS_LIB) $(LDLIBS) -o $@ |
| 1170 |
-+coadd: coadd-main.o $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 1171 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@ |
| 1172 |
- ALL_OBJ += coadd.o coadd-main.o |
| 1173 |
- |
| 1174 |
--wcs-resample: wcs-resample-main.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 1175 |
-- $(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@ |
| 1176 |
-+wcs-resample: wcs-resample-main.o $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 1177 |
-+ $(CC) $(LDFLAGS) $^ $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@ |
| 1178 |
- ALL_OBJ += wcs-resample-main.o |
| 1179 |
- |
| 1180 |
--fit-wcs: fit-wcs-main.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 1181 |
-- $(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@ |
| 1182 |
-+fit-wcs: fit-wcs-main.o $(ANFILES_LIB) $(LIBKD_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 1183 |
-+ $(CC) $^ $(LDFLAGS) $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@ |
| 1184 |
- ALL_OBJ += fit-wcs-main.o |
| 1185 |
- |
| 1186 |
--get-healpix: get-healpix.o $(ANUTILS_LIB) $(GSL_LIB) |
| 1187 |
-+get-healpix: get-healpix.o $(ANUTILS_LIB) |
| 1188 |
- ALL_OBJ += get-healpix.o |
| 1189 |
- |
| 1190 |
--wcs-to-tan: wcs-to-tan.o $(ANUTILS_LIB) $(GSL_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 1191 |
-- $(CC) $^ $(LDFLAGS) $(WCS_LIB) $(LDLIBS) -o $@ |
| 1192 |
-+wcs-to-tan: wcs-to-tan.o $(ANUTILS_LIB) $(QFITS_LIB) $(WCS_LIB_DEP) |
| 1193 |
-+ $(CC) $^ $(LDFLAGS) $(GSL_LIB) $(WCS_LIB) $(LDLIBS) -o $@ |
| 1194 |
- ALL_OBJ += wcs-to-tan.o |
| 1195 |
- |
| 1196 |
- pad-file: pad-file.o $(ANUTILS_LIB) |
| 1197 |
-@@ -482,7 +482,7 @@ |
| 1198 |
- test_convolve_image test_qsort_r test_wcs test_big_tables |
| 1199 |
- # test_hd depends on hd.fits... |
| 1200 |
- ALL_TEST_EXTRA_OBJS = |
| 1201 |
--ALL_TEST_LIBS = $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 1202 |
-+ALL_TEST_LIBS = $(LIBKD_LIB) $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1203 |
- ALL_TEST_EXTRA_LDFLAGS = $(WCSLIB_LIB) |
| 1204 |
- |
| 1205 |
- include $(COMMON)/makefile.tests |
| 1206 |
-@@ -499,12 +499,12 @@ |
| 1207 |
- |
| 1208 |
- test_errors: $(ANUTILS_LIB) |
| 1209 |
- |
| 1210 |
--test_sip-utils: $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 1211 |
-+test_sip-utils: $(ANUTILS_LIB) $(QFITS_LIB) |
| 1212 |
- |
| 1213 |
--test_anwcs: $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 1214 |
-+test_anwcs: $(ANUTILS_LIB) $(QFITS_LIB) |
| 1215 |
- $(CC)$(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) -o $@ |
| 1216 |
- |
| 1217 |
--test_wcs: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) $(GSL_LIB) |
| 1218 |
-+test_wcs: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1219 |
- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WCSLIB_LIB) -o $@ |
| 1220 |
- |
| 1221 |
- test_tycho2: $(ANFILES_LIB) $(ANUTILS_LIB) $(QFITS_LIB) |
| 1222 |
-@@ -537,7 +537,7 @@ |
| 1223 |
- |
| 1224 |
- test_starutil: $(ANUTILS_LIB) |
| 1225 |
- |
| 1226 |
--test_svd: $(ANUTILS_LIB) $(GSL_LIB) |
| 1227 |
-+test_svd: $(ANUTILS_LIB) |
| 1228 |
- |
| 1229 |
- ### /TESTS |
| 1230 |
- |
| 1231 |
-diff -Nur astrometry.net-0.43.as-needed/util/makefile.gsl astrometry.net-0.43/util/makefile.gsl |
| 1232 |
---- astrometry.net-0.43.as-needed/util/makefile.gsl 2013-06-14 10:25:20.812174131 -0700 |
| 1233 |
-+++ astrometry.net-0.43/util/makefile.gsl 2013-06-14 10:25:58.643379797 -0700 |
| 1234 |
-@@ -14,10 +14,5 @@ |
| 1235 |
- # along with the Astrometry.net suite ; if not, write to the Free Software |
| 1236 |
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 1237 |
- |
| 1238 |
--GSL_DIR := $(BASEDIR)/gsl-an |
| 1239 |
--GSL_INC := -I$(GSL_DIR) |
| 1240 |
--GSL_LIB := $(GSL_DIR)/libgsl-an.a |
| 1241 |
-- |
| 1242 |
--$(GSL_LIB): |
| 1243 |
-- $(MAKE) -C $(GSL_DIR) |
| 1244 |
-- |
| 1245 |
-+GSL_INC ?= $(shell pkg-config --cflags gsl 2>/dev/null) |
| 1246 |
-+GSL_LIB ?= $(shell pkg-config --libs gsl 2>/dev/null) |
| 1247 |
-diff -Nur astrometry.net-0.43.as-needed/util/setup-util.py astrometry.net-0.43/util/setup-util.py |
| 1248 |
---- astrometry.net-0.43.as-needed/util/setup-util.py 2013-06-14 10:25:20.814174084 -0700 |
| 1249 |
-+++ astrometry.net-0.43/util/setup-util.py 2013-06-14 10:39:45.250959084 -0700 |
| 1250 |
-@@ -22,9 +22,8 @@ |
| 1251 |
- '../libkd/libkd.a', |
| 1252 |
- 'libanutils.a', |
| 1253 |
- '../qfits-an/lib/libqfits.a', |
| 1254 |
-- '../gsl-an/libgsl-an.a', |
| 1255 |
- ], |
| 1256 |
-- extra_link_args=[os.environ.get('WCSLIB_LIB', ''), |
| 1257 |
-+ extra_link_args=[os.environ.get('WCSLIB_LIB') + ' ' + os.environ.get('GSL_LIB'), |
| 1258 |
- #os.environ.get('GSL_LIB', ''), |
| 1259 |
- #'-O0 -g' |
| 1260 |
- ], |
| 1261 |
|
| 1262 |
diff --git a/sci-astronomy/astrometry/metadata.xml b/sci-astronomy/astrometry/metadata.xml |
| 1263 |
deleted file mode 100644 |
| 1264 |
index 70d2867..0000000 |
| 1265 |
--- a/sci-astronomy/astrometry/metadata.xml |
| 1266 |
+++ /dev/null |
| 1267 |
@@ -1,18 +0,0 @@ |
| 1268 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 1269 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1270 |
-<pkgmetadata> |
| 1271 |
- <maintainer type="project"> |
| 1272 |
- <email>sci-astronomy@g.o</email> |
| 1273 |
- <name>Gentoo Astronomy Project</name> |
| 1274 |
- </maintainer> |
| 1275 |
- <longdescription lang="en"> |
| 1276 |
- If you have astronomical imaging of the sky with celestial |
| 1277 |
- coordinates you do not know—or do not trust—then Astrometry.net is |
| 1278 |
- for you. Input an image and we'll give you back astrometric |
| 1279 |
- calibration meta-data, plus lists of known objects falling inside |
| 1280 |
- the field of view. |
| 1281 |
-</longdescription> |
| 1282 |
- <use> |
| 1283 |
- <flag name="extra">Add extra tools, specifically for plots</flag> |
| 1284 |
- </use> |
| 1285 |
-</pkgmetadata> |
Archives