Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-2752 build: Enhance build for cross compilation for MIC
[fs/lustre-release.git]
/
lnet
/
utils
/
Makefile.am
diff --git
a/lnet/utils/Makefile.am
b/lnet/utils/Makefile.am
index
37a2e04
..
f11a21a
100644
(file)
--- a/
lnet/utils/Makefile.am
+++ b/
lnet/utils/Makefile.am
@@
-25,7
+25,7
@@
#
#
#
#
-# Copyright
2008 Sun Microsystems, Inc. All rights reserved
+# Copyright
(c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
# Use is subject to license terms.
#
@@
-38,6
+38,7
@@
#COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
#LINK = $(CC) -o $@
#COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
#LINK = $(CC) -o $@
+LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
if LIBLUSTRE
LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
if LIBLUSTRE
@@
-64,21
+65,12
@@
sbin_PROGRAMS += ptlctl routerstat wirecheck lst
if LIBLUSTRE
sbin_PROGRAMS += lstclient
endif
if LIBLUSTRE
sbin_PROGRAMS += lstclient
endif
-
-if BUILD_GMLND
-sbin_PROGRAMS += gmlndnid
-endif
endif
wirecheck_SOURCES = wirecheck.c
endif
wirecheck_SOURCES = wirecheck.c
-gmlndnid_SOURCES = gmlndnid.c
-gmlndnid_CFLAGS = $(GMCPPFLAGS)
-gmlndnid_LDFLAGS = -static
-gmlndnid_LDADD = $(GMLIBS) -lgm
-
ptlctl_SOURCES = ptlctl.c
ptlctl_SOURCES = ptlctl.c
-ptlctl_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIBREADLINE) $(LIBEFENCE)
+ptlctl_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIB
CFS) $(LIB
READLINE) $(LIBEFENCE)
ptlctl_DEPENDENCIES = libptlctl.a
routerstat_SOURCES = routerstat.c
ptlctl_DEPENDENCIES = libptlctl.a
routerstat_SOURCES = routerstat.c
@@
-88,19
+80,20
@@
debugctl_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIBREADLINE) $(LIBEFENCE)
debugctl_DEPENDENCIES = libptlctl.a
lst_SOURCES = lst.c
debugctl_DEPENDENCIES = libptlctl.a
lst_SOURCES = lst.c
-lst_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIBREADLINE) $(LIBEFENCE)
+lst_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIB
CFS) $(LIB
READLINE) $(LIBEFENCE)
lst_DEPENDENCIES = libptlctl.a
LND_LIBS =
if BUILD_USOCKLND
LND_LIBS += $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
endif
lst_DEPENDENCIES = libptlctl.a
LND_LIBS =
if BUILD_USOCKLND
LND_LIBS += $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
endif
-if BUILD_UPTLLND
-LND_LIBS += $(top_builddir)/lnet/ulnds/ptllnd/libptllnd.a
-endif
if LIBLUSTRE
LIB_SELFTEST = $(top_builddir)/libcfs/libcfs/libcfs.a $(top_builddir)/lnet/lnet/liblnet.a $(top_builddir)/lnet/selftest/libselftest.a
if LIBLUSTRE
LIB_SELFTEST = $(top_builddir)/libcfs/libcfs/libcfs.a $(top_builddir)/lnet/lnet/liblnet.a $(top_builddir)/lnet/selftest/libselftest.a
+
+export AR
+export RANLIB
+
liblst.a : $(LIB_SELFTEST) $(LND_LIBS)
sh $(srcdir)/genlib.sh "$(LIBS)" "$(LND_LIBS)" "$(PTHREAD_LIBS)"
liblst.a : $(LIB_SELFTEST) $(LND_LIBS)
sh $(srcdir)/genlib.sh "$(LIBS)" "$(LND_LIBS)" "$(PTHREAD_LIBS)"