diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2012-01-20 12:37:26 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:43 +0100 |
| commit | 2bf4d1938789dd580ad266bd6dbce63f45991580 (patch) | |
| tree | 1e864b1049e85d930ccbced61447dc1145754460 | |
| parent | 36c3440e23106e6fdb1a947f9300b23228c3109a (diff) | |
Revert "Compile libcrystfel with -fPIC"
This reverts commit 7d1e8202cdd52a9df2c9599d52b69550b4d8187d.
| -rw-r--r-- | libcrystfel/Makefile.am | 1 | ||||
| -rw-r--r-- | libcrystfel/Makefile.in | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/libcrystfel/Makefile.am b/libcrystfel/Makefile.am index 39b92bde..1dc9258f 100644 --- a/libcrystfel/Makefile.am +++ b/libcrystfel/Makefile.am @@ -1,6 +1,5 @@ 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 289117da..f07bd5dd 100644 --- a/libcrystfel/Makefile.in +++ b/libcrystfel/Makefile.in @@ -94,10 +94,6 @@ 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 @@ -359,7 +355,6 @@ 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 \ @@ -474,7 +469,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)$(libcrystfel_la_LINK) -rpath $(libdir) $(libcrystfel_la_OBJECTS) $(libcrystfel_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libcrystfel_la_OBJECTS) $(libcrystfel_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) |