LU-1346 libcfs: cleanup macros in kp30.h

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

diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am
index 63c095d..ea8861b 100644 (file)
--- a/lnet/klnds/socklnd/autoMakefile.am
+++ b/lnet/klnds/socklnd/autoMakefile.am
@@ -1,35 +1,29 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
 if MODULES
-if !CRAY_PORTALS
-
 if LINUX
-modulenet_DATA = ksocknal$(KMODEXT)
-endif
 
-if DARWIN
-macos_PROGRAMS := ksocknal
+  modulenet_DATA := ksocklnd$(KMODEXT)
 
-ksocknal_SOURCES := socknal.c socknal_cb.c socknal_lib-darwin.c
+endif # LINUX
+endif # MODULES
 
-ksocknal_CFLAGS := $(EXTRA_KCFLAGS)
-ksocknal_LDFLAGS := $(EXTRA_KLDFLAGS)
-ksocknal_LDADD := $(EXTRA_KLIBS)
+EXTRA_DIST := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h
 
-plist_DATA := Info.plist
+if DARWIN
+  macos_PROGRAMS = ksocklnd
 
-install-data-hook: fix-kext-ownership
+  nodist_ksocklnd_SOURCES = socklnd.c socklnd_cb.c socklnd_proto.c
+  nodist_ksocklnd_SOURCES += socklnd_modparams.c socklnd_lib-darwin.c
+  EXTRA_DIST += socklnd_lib-darwin.c socklnd_lib-darwin.h
 
-endif
+  ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
+  ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
+  ksocklnd_LDADD := $(EXTRA_KLIBS)
 
-endif
-endif
+  plist_DATA = Info.plist
+  install_data_hook = fix-kext-ownership
+endif # DARWIN
 
-EXTRA_DIST := Info.plist
+EXTRA_DIST += $(plist_DATA)
+install-data-hook: $(install_data_hook)
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c socknal_lib.c
-DIST_SOURCES = $(ksocknal-objs:%.o=%.c) socknal_lib-darwin.c   \
-       socknal_lib-darwin.h socknal_lib-linux.h socknal.h
+MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ socklnd_lib.c