landing b_cmobd_merge on HEAD

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

diff --git a/lnet/lnet/Makefile.am b/lnet/lnet/autoMakefile.am
similarity index 57%
rename from lnet/lnet/Makefile.am
rename to lnet/lnet/autoMakefile.am
index 59f9dd9..bf7a107 100644 (file)
--- a/lnet/lnet/Makefile.am
+++ b/lnet/lnet/autoMakefile.am
@@ -3,30 +3,24 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-DEFS =
-
 my_sources = api-eq.c api-init.c api-me.c api-errno.c api-ni.c api-wrap.c \
                lib-dispatch.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
 
-noinst_LIBRARIES= libportals.a
-libportals_a_SOURCES= $(my_sources)
+if !CRAY_PORTALS
 
 if LIBLUSTRE
-libportals_a_CFLAGS= -fPIC
-else
-
-MODULE = portals
-modulenet_DATA = portals.o
-EXTRA_PROGRAMS = portals
-
-DISTCLEANFILES = *.orig *.rej
+noinst_LIBRARIES= libportals.a
+libportals_a_SOURCES= $(my_sources)
+libportals_a_CPPFLAGS = $(LLCPPFLAGS)
+libportals_a_CFLAGS = $(LLCFLAGS)
+endif
 
-portals_SOURCES= module.c $(my_sources)
+if MODULES
+modulenet_DATA = portals$(KMODEXT)
+endif # MODULES
 
-# Don't distribute any patched files.
-dist-hook:
-       list='$(EXT2C)'; for f in $$list; do rm -f $(distdir)/$$f; done
+endif # CRAY_PORTALS
 
-include ../Rules.linux
-endif
+MOSTLYCLEANFILES = *.o *.ko *.mod.c
+DIST_SOURCES = $(portals-objs:%.o=%.c)