From 00a9a97e82871085541a0717203c3e918a4cafa7 Mon Sep 17 00:00:00 2001
From: zab <zab>
Date: Thu, 22 May 2003 07:51:54 +0000
Subject: [PATCH] - N instances of lib objs will collide in the final link,
 lets try building   it explicitly.. - get obdecho/lib compiling, make headway
 into obdclass - I'm tired of adding Makefile.mk entries to configure.in -
 lproc's awesome code duplication was saddening the final link, just call me  
 cap'n static

---
 lustre/lib/Makefile.mk      |  8 ++++++++
 lustre/obdclass/Makefile.mk | 23 +++++++++++++++++++++++
 lustre/obdecho/Makefile.mk  |  9 +++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 lustre/lib/Makefile.mk
 create mode 100644 lustre/obdclass/Makefile.mk
 create mode 100644 lustre/obdecho/Makefile.mk

diff --git a/lustre/lib/Makefile.mk b/lustre/lib/Makefile.mk
new file mode 100644
index 0000000..d83965a
--- /dev/null
+++ b/lustre/lib/Makefile.mk
@@ -0,0 +1,8 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include $(src)/../portals/Kernelenv
+
+obj-y += mds_updates.o simple.o target.o
diff --git a/lustre/obdclass/Makefile.mk b/lustre/obdclass/Makefile.mk
new file mode 100644
index 0000000..8e033ac
--- /dev/null
+++ b/lustre/obdclass/Makefile.mk
@@ -0,0 +1,23 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include $(src)/../portals/Kernelenv
+
+obj-y += obdclass.o fsfilt_ext3.o
+obdclass-objs := class_obd.o debug.o genops.o sysctl.o uuid.o \
+		lprocfs_status.o lustre_handles.o lustre_peer.o fsfilt.o \
+		statfs_pack.o
+
+$(obj)/class_obd.o: lustre_build_version
+
+# XXX I'm sure there's some automake mv-if-different helper for this.
+.PHONY:
+lustre_build_version:
+	pwd
+	perl $(src)/../scripts/version_tag.pl $(src)/.. $(obj)/.. > $(obj)/tmpver
+	cmp -s $(src)/../include/linux/lustre_build_version.h $(obj)/tmpver \
+		2> /dev/null &&                                            \
+		$(RM) $(obj)/tmpver ||                                            \
+		mv $(obj)/tmpver $(src)/../include/linux/lustre_build_version.h
diff --git a/lustre/obdecho/Makefile.mk b/lustre/obdecho/Makefile.mk
new file mode 100644
index 0000000..07b7040
--- /dev/null
+++ b/lustre/obdecho/Makefile.mk
@@ -0,0 +1,9 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include $(src)/../portals/Kernelenv
+
+obj-y += obdecho.o
+obdecho-objs := echo.o echo_client.o lproc_echo.o
-- 
1.8.3.1