diff --git a/astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch b/astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch index 1554f48..4c9f8b6 100644 --- a/astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch +++ b/astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch @@ -9,7 +9,7 @@ Subject: Dynamically link to libastrometry.so, when possible 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/blind/Makefile b/blind/Makefile -index 1d55c9c..21f68c4 100644 +index 5ce0c89..66fdc54 100644 --- a/blind/Makefile +++ b/blind/Makefile @@ -43,9 +43,7 @@ LDFLAGS := $(LDFLAGS_DEF) @@ -58,10 +58,20 @@ index f535986..0442518 100644 CFLAGS="$(CFLAGS)" \ $(PYTHON) setup.py build_ext --inplace --force --build-temp . diff --git a/util/Makefile b/util/Makefile -index f88df1b..0ecf716 100644 +index b00f71f..84507bb 100644 --- a/util/Makefile +++ b/util/Makefile -@@ -86,8 +86,7 @@ CFLAGS += -I. +@@ -50,8 +50,7 @@ ANFILES_OBJ += multiindex.o index.o codekd.o starkd.o rdlist.o xylist.o \ + tabsort.o wcs-xy2rd.o wcs-rd2xy.o + ANFILES_DEPS += $(QFITS_LIB) + +-ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \ +- tic.o ++ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o + ANUTILS_DEPS += $(QFITS_LIB) + endif + +@@ -96,8 +95,7 @@ CFLAGS += -I. LDFLAGS += $(LDFLAGS_DEF) @@ -71,18 +81,8 @@ index f88df1b..0ecf716 100644 SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF) -@@ -122,8 +121,7 @@ ANUTILS_H := an-bool.h an-endian.h an-opts.h an-thread-pthreads.h \ - ANUTILS_H_PATH := $(addprefix $(INCLUDE_DIR)/,$(ANUTILS_H)) - - ifndef NO_QFITS --ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \ -- tic.o -+ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o - ANUTILS_DEPS += $(QFITS_LIB) - endif - -@@ -164,7 +162,7 @@ wcs-pv2sip: wcs-pv2sip.o $(ANUTILS_SLIB) - ALL_OBJ += wcs-pv2sip.o +@@ -161,7 +159,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB) + ALL_OBJ += an-pnmtofits.o _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB) - LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" SLIB="$(ANFILES_SLIB)" \