diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2010-05-02 15:52:21 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2010-05-02 15:52:21 +0200 |
| commit | 0c837fd075fabf85ee6e6d6a74079f12bb171dd3 (patch) | |
| tree | 300c57e50108be2a0d28c2cc95e647963ad56511 | |
| parent | 47622c1e468933d6d3f6c46ba723dccdb5a18776 (diff) | |
| download | patch-0c837fd075fabf85ee6e6d6a74079f12bb171dd3.tar.gz | |
Fix the linker library order
* src/Makefile.am (patch_LDADD): Add $(LIB_CLOCK_GETTIME) here, after
libpatch.a, so that clock_gettime is properly resolved on systems on
which the library order matters.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2009-05-02 Andreas Gruenbacher <agruen@suse.de> + * src/Makefile.am (patch_LDADD): Add $(LIB_CLOCK_GETTIME) here, after + libpatch.a, so that clock_gettime is properly resolved on systems on + which the library order matters. + * NEWS: Update. * gnulib: Update to latest. * bootstrap: Update from gnulib. diff --git a/src/Makefile.am b/src/Makefile.am index b404950..c1a1f9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,8 +31,7 @@ patch_SOURCES = \ version.h AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib -patch_LDFLAGS = $(LIB_CLOCK_GETTIME) -patch_LDADD = $(top_builddir)/lib/libpatch.a +patch_LDADD = $(LDADD) $(top_builddir)/lib/libpatch.a $(LIB_CLOCK_GETTIME) if ENABLE_MERGE patch_SOURCES += merge.c |