Landing b_hd_newconfig on HEAD

[fs/lustre-release.git] / lnet / klnds / socklnd / autoMakefile.am

diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am
index 71a3633..0dbe697 100644 (file)
--- a/lnet/klnds/socklnd/autoMakefile.am
+++ b/lnet/klnds/socklnd/autoMakefile.am
@@ -1,25 +1,23 @@
 if MODULES
 if LINUX
-if !CRAY_PORTALS
 
-  modulenet_DATA := ksocknal$(KMODEXT)
+  modulenet_DATA := ksocklnd$(KMODEXT)
 
-endif # !CRAY_PORTALS
 endif # LINUX
 endif # MODULES
 
-DIST_SOURCES := $(ksocknal-objs:%.o=%.c) socknal_lib-linux.h socknal.h
+DIST_SOURCES := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h
 
 if DARWIN
 
-  macos_PROGRAMS := ksocknal
+  macos_PROGRAMS := ksocklnd
 
-  nodist_ksocknal_SOURCES := socknal.c socknal_cb.c socknal_lib-darwin.c
-  DIST_SOURCES += socknal_lib-darwin.c socknal_lib-darwin.h
+  nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_modparams.c socklnd_lib-darwin.c
+  DIST_SOURCES += socklnd_lib-darwin.c socklnd_lib-darwin.h
 
-  ksocknal_CFLAGS := $(EXTRA_KCFLAGS)
-  ksocknal_LDFLAGS := $(EXTRA_KLDFLAGS)
-  ksocknal_LDADD := $(EXTRA_KLIBS)
+  ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
+  ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
+  ksocklnd_LDADD := $(EXTRA_KLIBS)
 
   plist_DATA := Info.plist
   install_data_hook := fix-kext-ownership
@@ -29,4 +27,4 @@ endif # DARWIN
 EXTRA_DIST := $(plist_DATA)
 install-data-hook: $(install_data_hook)
 
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  socknal_lib.c
+MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ socklnd_lib.c