X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2FautoMakefile.am;h=298e17d5e7b981ba1666d4c81878d2f0d6bedfaf;hb=790ac5c12fa977d8663317bb9a1de41bb6e2e044;hp=affce6ee564c8d2649c02674a9e96c669509889f;hpb=2cf76d01116451a107966af72e7421d7a675be49;p=fs%2Flustre-release.git

diff --git a/lnet/lnet/autoMakefile.am b/lnet/lnet/autoMakefile.am
index affce6e..298e17d 100644
--- a/lnet/lnet/autoMakefile.am
+++ b/lnet/lnet/autoMakefile.am
@@ -1,32 +1,34 @@
-my_sources =    api-errno.c api-ni.c api-wrap.c \
-		lib-init.c lib-me.c lib-msg.c lib-eq.c \
-		lib-md.c lib-move.c lib-ni.c lib-pid.c
+my_sources =    api-errno.c api-ni.c config.c \
+		lib-me.c lib-msg.c lib-eq.c \
+		lib-md.c lib-ptl.c lib-move.c lo.c \
+	        router.c router_proc.c \
+		acceptor.c peer.c
 
-if !CRAY_PORTALS
 
 if LIBLUSTRE
-noinst_LIBRARIES= libportals.a
-libportals_a_SOURCES= $(my_sources)
-libportals_a_CPPFLAGS = $(LLCPPFLAGS)
-libportals_a_CFLAGS = $(LLCFLAGS)
+noinst_LIBRARIES= liblnet.a
+liblnet_a_SOURCES= $(my_sources)
+liblnet_a_CPPFLAGS = $(LLCPPFLAGS)
+liblnet_a_CFLAGS = $(LLCFLAGS)
 endif
 
 if MODULES
 
 if LINUX
-modulenet_DATA = portals$(KMODEXT)
+modulenet_DATA = lnet$(KMODEXT)
 endif # LINUX
 
 if DARWIN
-macos_PROGRAMS := portals
+macos_PROGRAMS := lnet
 
-portals_SOURCES := api-errno.c api-ni.c api-wrap.c
-portals_SOURCES += lib-init.c lib-me.c lib-msg.c lib-eq.c lib-md.c
-portals_SOURCES += lib-move.c lib-ni.c lib-pid.c module.c
+lnet_SOURCES := api-errno.c api-ni.c config.c
+lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c lib-ptl.c
+lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
+lnet_SOURCES += acceptor.c peer.c
 
-portals_CFLAGS := $(EXTRA_KCFLAGS)
-portals_LDFLAGS := $(EXTRA_KLDFLAGS)
-portals_LDADD := $(EXTRA_KLIBS)
+lnet_CFLAGS := $(EXTRA_KCFLAGS)
+lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
+lnet_LDADD := $(EXTRA_KLIBS)
 
 plist_DATA := Info.plist
 
@@ -36,11 +38,7 @@ endif # DARWIN
 
 endif # MODULES
 
-endif # CRAY_PORTALS
-
 install-data-hook: $(install_data_hook)
 
-EXTRA_DIST := Info.plist
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c portals
-DIST_SOURCES = $(portals-objs:%.o=%.c)
+MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ lnet
+EXTRA_DIST = $(lnet-objs:%.o=%.c) Info.plist