diff options
| author | Thomas White <taw@physics.org> | 2011-11-15 17:54:16 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:41 +0100 |
| commit | d2d8f12e07f4d9c5d096936a67301f03e83e29e9 (patch) | |
| tree | ef5036734648ab311c5ec0699a1ebfc51d7fe011 | |
| parent | 493e74ca02d4afe767e44bc42eb05e8029a8776d (diff) | |
Don't pull GNUlib into shared library
| -rw-r--r-- | libcrystfel/Makefile.am | 2 | ||||
| -rw-r--r-- | libcrystfel/Makefile.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libcrystfel/Makefile.am b/libcrystfel/Makefile.am index 5a876427..1dc9258f 100644 --- a/libcrystfel/Makefile.am +++ b/libcrystfel/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libcrystfel.la -libcrystfel_la_LIBADD = $(top_builddir)/lib/libgnu.a @LIBCRYSTFEL_LIBS@ +libcrystfel_la_LIBADD = @LIBCRYSTFEL_LIBS@ 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 734021a7..21ef4cb5 100644 --- a/libcrystfel/Makefile.in +++ b/libcrystfel/Makefile.in @@ -82,7 +82,7 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(libcrystfel_la_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libcrystfel_la_LIBADD = +libcrystfel_la_DEPENDENCIES = am__dirstamp = $(am__leading_dot)dirstamp am_libcrystfel_la_OBJECTS = src/reflist.lo src/utils.lo src/cell.lo \ src/detector.lo src/thread-pool.lo src/image.lo \ @@ -350,7 +350,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libcrystfel.la -LDADD = $(top_builddir)/lib/libgnu.a @LIBCRYSTFEL_LIBS@ +libcrystfel_la_LIBADD = @LIBCRYSTFEL_LIBS@ 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 \ |