X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fliblustre%2FMakefile.am;h=b831bd8b1e09c2b3bfb936af8480a3a8ed5c3c27;hp=6622485afb37ff4f5da35f60d5b81e5bbf1ac00a;hb=bd1b99d7caa6ab2b7c771524af9178a3da69eeab;hpb=e0576be940d7af30b2ba6e219891a4413670325d

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 6622485..b831bd8 100644
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,46 +1,40 @@
 ## Liblustre excecutables & libraries Makefile
-DEFS=
-
 SUBDIRS = . tests
 
-CFLAGS := -g -Wall -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include \
-          -I$(top_srcdir)/portals/unals -I$(SYSIO)/include
+AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 $(LLCPPFLAGS) -I$(top_srcdir)/portals/unals
+AM_CFLAGS = $(LLCFLAGS)
 
-CPPFLAGS = $(HAVE_EFENCE) -D_LARGEFILE64_SOURCE=1
 LIBS = $(LIBEFENCE)
 
 LUSTRE_LIBS = libllite.a \
-              $(top_srcdir)/lov/liblov.a \
-              $(top_srcdir)/obdecho/libobdecho.a \
-              $(top_srcdir)/osc/libosc.a \
-              $(top_srcdir)/mdc/libmdc.a \
-              $(top_srcdir)/ptlrpc/libptlrpc.a \
-              $(top_srcdir)/obdclass/liblustreclass.a \
-              $(top_srcdir)/lvfs/liblvfs.a
-
-PTL_LIBS = $(top_srcdir)/portals/utils/libuptlctl.a \
-           $(top_srcdir)/portals/unals/libtcpnal.a \
-           $(top_srcdir)/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
-
-#SYSIO_LIBS = $(SYSIO)/lib/libsysio.a
-
+              $(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
+
+if LIBLUSTRE
 lib_LIBRARIES = liblustre.a
 noinst_LIBRARIES = libllite.a
+endif
 
-libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c
-libllite_a_CFLAGS = -fPIC
+libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c llite_lib.h
 
 # for make rpms -- need cleanup
 liblustre_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c
-liblustre_a_CFLAGS = -fPIC
 
 liblustre.a : $(LUSTRE_LIBS) $(PTL_LIBS) $(SYSIO_LIBS)
-	$(shell ./genlib.sh $(SYSIO) $(AR) $(LINK))
-
-include $(top_srcdir)/Rules
+	$(srcdir)/genlib.sh $(SYSIO) $(AR) $(LINK) || ( rm -f $@; exit 1 )
 
+EXTRA_DIST = genlib.sh