From: Brian J. Murrell <brian.murrell@oracle.com>
Date: Fri, 14 May 2010 15:18:02 +0000 (-0400)
Subject: b=22749 revert "b=20355 Add $(PTHREAD_LIBS) to lctl and lfs build"
X-Git-Tag: v1_8_3_51~43
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=413f82ea804385a04dae2b823dd4ad1f6a6b5be7;p=fs%2Flustre-release.git

b=22749 revert "b=20355 Add $(PTHREAD_LIBS) to lctl and lfs build"

This reverts commit 9797ebe88156330be7338e0bd75d73292e38e007 to resolve
an issue with lctl --threads not working correctly with  $(PTHREAD_LIBS)
being linked to lctl.

i=johann
i=adilger
---

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 4fa490a..854a7a9 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -6,7 +6,7 @@ AM_LDFLAGS := -L$(top_builddir)/lnet/utils
 
 LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a
 
-sbin_scripts = lrun
+sbin_scripts = lrun 
 bin_scripts = llstat llobdstat plot-llstat
 
 if UTILS
@@ -28,12 +28,12 @@ endif # UTILS
 lib_LIBRARIES = liblustreapi.a
 
 lctl_SOURCES = parser.c obd.c lustre_cfg.c lctl.c parser.h obdctl.h platform.h
-lctl_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
+lctl_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL)
 lctl_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
 lfs_SOURCES = lfs.c parser.c lustre_cfg.c obd.c
-lfs_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
-lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+lfs_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL)
+lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a 
 
 loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c
 loadgen_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
@@ -45,7 +45,7 @@ if EXT2FS_DEVEL
 EXT2FSLIB = -lext2fs
 E2PLIB = -le2p
 else
-E2PLIB =
+E2PLIB = 
 EXT2FSLIB =
 endif