Message ID | 20121106173302.26310.82037.stgit@seurat.1015granger.net |
---|---|
State | Accepted |
Headers | show |
diff --git a/src/libjunction/Makefile.am b/src/libjunction/Makefile.am index fd35365..c9eb92a 100644 --- a/src/libjunction/Makefile.am +++ b/src/libjunction/Makefile.am @@ -29,8 +29,8 @@ noinst_LTLIBRARIES = libjunction.la noinst_PROGRAMS = display-junction libjunction_la_SOURCES = export-cache.c fedfs.c junction.c \ locations.c nfs.c xml.c -LDADD = $(top_builddir)/src/libxlog/libxlog.la \ - $(top_builddir)/src/libjunction/libjunction.la \ +display_junction_LDADD = $(top_builddir)/src/libxlog/libxlog.la \ + libjunction.la \ $(top_builddir)/src/libnsdb/libnsdb.la CLEANFILES = cscope.in.out cscope.out cscope.po.out *~
Making fedfs-utils with the "-j" option fails with: Making all in libjunction CC export-cache.lo CC fedfs.lo CC junction.lo CC locations.lo CC nfs.lo CC xml.lo make[3]: *** No rule to make target `../../src/libjunction/libjunction.la', needed by `display-junction'. Stop. make[3]: *** Waiting for unfinished jobs.... CC display-junction.o make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 [cel@seurat fedfs-utils]$ Ensure the "display-junction" dependency targets the local version of libjunction.a so that make will always build the library before building display-junction. Introduced by commit 07cdb9c40ffc27fbb5fddc3c0357417f73182ddb "libjunction: Add a small tool for content of a live junction," Thu Oct 11 15:01:38 2012. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- src/libjunction/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)