- landing of b_hd_cleanup_merge to HEAD.

[fs/lustre-release.git] / lustre / Makefile.mk

diff --git a/lustre/Makefile.mk b/lustre/Makefile.mk
index e540148..6b1aeca 100644 (file)
--- a/lustre/Makefile.mk
+++ b/lustre/Makefile.mk
@@ -1,4 +1,23 @@
-include fs/lustre/portals/Kernelenv
+include $(src)/portals/Kernelenv
+
+# for scripts/version_tag.pl
+LINUX = @LINUX@
 
 obj-y += portals/
+# obdclass has to come before anything that does class_register..
+obj-y += obdclass/
+obj-y += ptlrpc/
+obj-y += obdfilter/
+obj-y += mdc/
 obj-y += mds/
+obj-y += obdecho/
+obj-y += osc/
+obj-y += ost/
+obj-y += lov/
+obj-y += lmv/
+obj-y += llite/
+obj-y += lvfs/
+
+# portals needs to be before utils/, which pulls in ptlctl objects
+obj-m += utils/
+obj-m += tests/