|
 |
23dea7f |
From: Ole Streicher <olebole@debian.org>
|
|
|
23dea7f |
Date: Thu, 1 Dec 2016 21:18:56 +0100
|
|
|
23dea7f |
Subject: Dynamically link to libastrometry.so, when possible
|
|
|
23dea7f |
|
|
|
23dea7f |
---
|
|
 |
426655e |
libkd/Makefile | 3 +--
|
|
|
426655e |
solver/Makefile | 10 ++++------
|
|
|
426655e |
util/Makefile | 8 +++-----
|
|
|
23dea7f |
3 files changed, 8 insertions(+), 13 deletions(-)
|
|
|
23dea7f |
|
|
|
426655e |
diff --git a/libkd/Makefile b/libkd/Makefile
|
|
|
426655e |
index d8de18e..77c0f3d 100644
|
|
|
426655e |
--- a/libkd/Makefile
|
|
|
426655e |
+++ b/libkd/Makefile
|
|
|
426655e |
@@ -92,8 +92,7 @@ py: pyspherematch
|
|
|
426655e |
PYSPHEREMATCH_OBJ := pyspherematch.o
|
|
|
426655e |
|
|
|
426655e |
spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB)
|
|
|
426655e |
- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \
|
|
|
426655e |
- SLIB="$(SLIB)" \
|
|
|
426655e |
+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../solver -lastrometry" \
|
|
|
426655e |
INC="$(INC)" \
|
|
|
426655e |
CFLAGS="$(CFLAGS)" \
|
|
|
426655e |
$(PYTHON) setup.py build_ext --inplace --force --build-temp .
|
|
|
426655e |
diff --git a/solver/Makefile b/solver/Makefile
|
|
|
426655e |
index 08f5e35..cdc98cd 100644
|
|
|
426655e |
--- a/solver/Makefile
|
|
|
426655e |
+++ b/solver/Makefile
|
|
|
426655e |
@@ -45,9 +45,7 @@ LDFLAGS := $(LDFLAGS_DEF)
|
|
|
23dea7f |
LDLIBS := $(LDLIBS_DEF)
|
|
|
23dea7f |
LDLIBS += $(ANFILES_LIB)
|
|
|
23dea7f |
|
|
|
23dea7f |
-SLIB := $(ENGINE_LIB)
|
|
|
23dea7f |
-SLIB += $(CATS_SLIB)
|
|
|
23dea7f |
-SLIB += $(ANFILES_SLIB)
|
|
|
23dea7f |
+SLIB := $(ENGINE_SO)
|
|
|
23dea7f |
|
|
|
426655e |
CFLAGS += $(CFLAGS_DEF)
|
|
|
426655e |
CFLAGS += $(CATS_INC)
|
|
|
426655e |
@@ -122,7 +120,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \
|
|
|
23dea7f |
resort-xylist.o
|
|
|
23dea7f |
|
|
|
23dea7f |
BUILD_INDEX_OBJS := build-index.o uniformize-catalog.o startree.o hpquads.o \
|
|
|
23dea7f |
- quad-builder.o quad-utils.o codefile.o codetree.o unpermute-stars.o \
|
|
|
23dea7f |
+ quad-builder.o codefile.o codetree.o unpermute-stars.o \
|
|
|
23dea7f |
unpermute-quads.o merge-index.o
|
|
|
23dea7f |
ENGINE_OBJS += $(BUILD_INDEX_OBJS)
|
|
|
23dea7f |
|
|
|
426655e |
@@ -133,8 +131,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
|
|
|
23dea7f |
$(AR) rc $@ $(ENGINE_OBJS)
|
|
|
23dea7f |
$(RANLIB) $@
|
|
|
23dea7f |
|
|
|
23dea7f |
-$(ENGINE_SO): $(ENGINE_OBJS) $(SLIB)
|
|
|
23dea7f |
- $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 $^ $(LDLIBS)
|
|
|
23dea7f |
+$(ENGINE_SO): $(ENGINE_LIB) $(CATS_SLIB) $(ANFILES_SLIB)
|
|
|
23dea7f |
+ $(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 -Wl,--whole-archive $^ -Wl,--no-whole-archive $(LDLIBS) -lpthread
|
|
|
23dea7f |
ln -s $@.0 $@
|
|
|
23dea7f |
|
|
|
23dea7f |
# old and miscellaneous executables that aren't part of the pipeline.
|
|
|
23dea7f |
diff --git a/util/Makefile b/util/Makefile
|
|
|
426655e |
index 1909bf4..db92966 100644
|
|
|
23dea7f |
--- a/util/Makefile
|
|
|
23dea7f |
+++ b/util/Makefile
|
|
|
426655e |
@@ -55,8 +55,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \
|
|
|
426655e |
tabsort.o wcs-xy2rd.o wcs-rd2xy.o matchfile.o
|
|
|
38125eb |
ANFILES_DEPS += $(QFITS_LIB)
|
|
|
38125eb |
|
|
|
38125eb |
-ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \
|
|
|
38125eb |
- tic.o
|
|
|
38125eb |
+ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o
|
|
|
38125eb |
ANUTILS_DEPS += $(QFITS_LIB)
|
|
|
38125eb |
endif
|
|
|
38125eb |
|
|
|
426655e |
@@ -101,8 +100,7 @@ CFLAGS += -I.
|
|
|
23dea7f |
|
|
|
23dea7f |
LDFLAGS += $(LDFLAGS_DEF)
|
|
|
23dea7f |
|
|
|
23dea7f |
-LDLIBS := $(LDLIBS_DEF)
|
|
|
23dea7f |
-LDLIBS += $(ANFILES_LIB)
|
|
|
23dea7f |
+LDLIBS := $(LDLIBS_DEF) -lm
|
|
|
23dea7f |
|
|
|
23dea7f |
SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF)
|
|
|
23dea7f |
|
|
|
426655e |
@@ -166,7 +164,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB)
|
|
|
38125eb |
ALL_OBJ += an-pnmtofits.o
|
|
|
23dea7f |
|
|
|
23dea7f |
_util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB)
|
|
|
23dea7f |
- LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" SLIB="$(ANFILES_SLIB)" \
|
|
|
426655e |
+ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../solver -lastrometry" \
|
|
|
23dea7f |
INC="$(ANFILES_INC)" CFLAGS="$(CFLAGS)" \
|
|
|
23dea7f |
$(PYTHON) setup.py build_ext -v --inplace --build-temp .
|
|
|
23dea7f |
util.py: util.i lanczos.i
|