diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2012-01-20 12:21:15 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:43 +0100 |
| commit | c4f05988a711b205e40e1d2fda2a975368194376 (patch) | |
| tree | bc872598268aed2c94d6004cd020b519bc7b12d0 /libcrystfel | |
| parent | f10be4ef3809425d665feb9428c7da1138914282 (diff) | |
Compile libcrystfel with -fPIC
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/Makefile.am | 1 | ||||
| -rw-r--r-- | libcrystfel/Makefile.in | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libcrystfel/Makefile.am b/libcrystfel/Makefile.am index 1dc9258f..39b92bde 100644 --- a/libcrystfel/Makefile.am +++ b/libcrystfel/Makefile.am @@ -1,5 +1,6 @@ lib_LTLIBRARIES = libcrystfel.la libcrystfel_la_LIBADD = @LIBCRYSTFEL_LIBS@ +libcrystfel_la_LDFLAGS = -fPIC libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c src/detector.c \ src/thread-pool.c src/image.c src/hdf5-file.c \ diff --git a/libcrystfel/Makefile.in b/libcrystfel/Makefile.in index f07bd5dd..289117da 100644 --- a/libcrystfel/Makefile.in +++ b/libcrystfel/Makefile.in @@ -94,6 +94,10 @@ libcrystfel_la_OBJECTS = $(am_libcrystfel_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent +libcrystfel_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libcrystfel_la_LDFLAGS) $(LDFLAGS) -o \ + $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -355,6 +359,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libcrystfel.la libcrystfel_la_LIBADD = @LIBCRYSTFEL_LIBS@ +libcrystfel_la_LDFLAGS = -fPIC libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c src/detector.c \ src/thread-pool.c src/image.c src/hdf5-file.c \ src/beam-parameters.c src/geometry.c src/statistics.c \ @@ -469,7 +474,7 @@ src/dirax.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/mosflm.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/reax.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) libcrystfel.la: $(libcrystfel_la_OBJECTS) $(libcrystfel_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libcrystfel_la_OBJECTS) $(libcrystfel_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libcrystfel_la_LINK) -rpath $(libdir) $(libcrystfel_la_OBJECTS) $(libcrystfel_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) |