Skip to content

Commit 8fa78e2

Browse files
authored
Merge pull request #19 from LSSTDESC/dylib_fix
Dylib fix
2 parents b35f49a + e1bb6d8 commit 8fa78e2

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ EXTRA_DIST = doc README.md
33
lib_LTLIBRARIES = libnmt.la
44
libnmt_la_SOURCES = src/utils.c src/flatsky_utils.c src/healpix_extra.c src/nmt_bins.c src/nmt_bins_flat.c src/nmt_field.c src/nmt_field_flat.c src/nmt_mask.c src/nmt_mask_flat.c src/nmt_master.c src/nmt_covar.c src/nmt_master_flat.c src/nmt_covar_flat.c
55
libnmt_la_CPPFLAGS = $(OPENMP_CFLAGS) -I./src/
6+
libnmt_la_LDFLAGS = $(OPENP_CFLAGS) -lfftw3 -lfftw3_omp -lgsl -lgslcblas -lcfitsio -lsharp -lfftpack -lc_utils -lm
67

78
include_HEADERS = src/namaster.h
89

Makefile.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ AM_V_lt = $(am__v_lt_@AM_V@)
151151
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
152152
am__v_lt_0 = --silent
153153
am__v_lt_1 =
154+
libnmt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
155+
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
156+
$(libnmt_la_LDFLAGS) $(LDFLAGS) -o $@
154157
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
155158
am_namaster_OBJECTS = src/namaster-nmt_main.$(OBJEXT)
156159
namaster_OBJECTS = $(am_namaster_OBJECTS)
@@ -407,6 +410,7 @@ EXTRA_DIST = doc README.md
407410
lib_LTLIBRARIES = libnmt.la
408411
libnmt_la_SOURCES = src/utils.c src/flatsky_utils.c src/healpix_extra.c src/nmt_bins.c src/nmt_bins_flat.c src/nmt_field.c src/nmt_field_flat.c src/nmt_mask.c src/nmt_mask_flat.c src/nmt_master.c src/nmt_covar.c src/nmt_master_flat.c src/nmt_covar_flat.c
409412
libnmt_la_CPPFLAGS = $(OPENMP_CFLAGS) -I./src/
413+
libnmt_la_LDFLAGS = $(OPENP_CFLAGS) -lfftw3 -lfftw3_omp -lgsl -lgslcblas -lcfitsio -lsharp -lfftpack -lc_utils -lm
410414
include_HEADERS = src/namaster.h
411415
namaster_SOURCES = src/nmt_main.c
412416
namaster_CPPFLAGS = $(OPENMP_CFLAGS) -I./src/
@@ -536,7 +540,7 @@ src/libnmt_la-nmt_covar_flat.lo: src/$(am__dirstamp) \
536540
src/$(DEPDIR)/$(am__dirstamp)
537541

538542
libnmt.la: $(libnmt_la_OBJECTS) $(libnmt_la_DEPENDENCIES) $(EXTRA_libnmt_la_DEPENDENCIES)
539-
$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libnmt_la_OBJECTS) $(libnmt_la_LIBADD) $(LIBS)
543+
$(AM_V_CCLD)$(libnmt_la_LINK) -rpath $(libdir) $(libnmt_la_OBJECTS) $(libnmt_la_LIBADD) $(LIBS)
540544
install-binPROGRAMS: $(bin_PROGRAMS)
541545
@$(NORMAL_INSTALL)
542546
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ where the optional `--user` flag can be used if you don't have admin privileges.
4747

4848
You can check that the python installation works by running the unit tests:
4949
```
50-
python -m unittest -v
50+
python -m unittest discover -v
5151
```
5252
Note that the `test` directory, containing all unit tests, also contains all the sample python scripts described in the documentation (see below).
5353

0 commit comments

Comments
 (0)