- $(top_builddir)/lov/liblov.a \
- $(top_builddir)/obdecho/libobdecho.a \
- $(top_builddir)/osc/libosc.a \
- $(top_builddir)/mdc/libmdc.a \
- $(top_builddir)/ptlrpc/libptlrpc.a \
- $(top_builddir)/obdclass/liblustreclass.a \
- $(top_builddir)/lvfs/liblvfs.a
-
-PTL_LIBS = $(top_builddir)/portals/utils/libuptlctl.a \
- $(top_builddir)/portals/unals/libtcpnal.a \
- $(top_builddir)/portals/portals/libportals.a
-
-SYSIO_LIBS = $(SYSIO)/drivers/native/libsysio_native.a \
- $(SYSIO)/drivers/sockets/libsysio_sockets.a \
- $(SYSIO)/src/libsysio.a \
- $(SYSIO)/dev/stdfd/libsysio_stdfd.a
+ $(top_builddir)/lustre/lov/liblov.a \
+ $(top_builddir)/lustre/obdecho/libobdecho.a \
+ $(top_builddir)/lustre/osc/libosc.a \
+ $(top_builddir)/lustre/fid/libfid.a \
+ $(top_builddir)/lustre/fld/libfld.a \
+ $(top_builddir)/lustre/lmv/liblmv.a \
+ $(top_builddir)/lustre/mdc/libmdc.a \
+ $(top_builddir)/lustre/mgc/libmgc.a \
+ $(top_builddir)/lustre/ptlrpc/libptlrpc.a \
+ $(top_builddir)/lustre/obdclass/liblustreclass.a
+
+LND_LIBS =
+if BUILD_USOCKLND
+LND_LIBS += $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
+endif
+
+LNET_LIBS = $(top_builddir)/lnet/utils/libuptlctl.a \
+ $(top_builddir)/lnet/lnet/liblnet.a
+
+SYSIO_LIBS = $(SYSIO)/lib/libsysio.a