land b1_5 onto HEAD

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

diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am
index f474455..e0982ca 100644 (file)
--- a/lustre/obdclass/autoMakefile.am
+++ b/lustre/obdclass/autoMakefile.am
@@ -1,18 +1,54 @@
+SUBDIRS := linux
+if DARWIN
+SUBDIRS += darwin
+endif
+DIST_SUBDIRS := $(SUBDIRS)
+
 if LIBLUSTRE
 
 noinst_LIBRARIES = liblustreclass.a
 liblustreclass_a_SOURCES = class_obd.c debug.c genops.c statfs_pack.c uuid.c 
-liblustreclass_a_SOURCES += lustre_handles.c lustre_peer.c lprocfs_status.c mea.c capa.c
-liblustreclass_a_SOURCES += obdo.c obd_config.c llog_swab.c llog_obd.c #llog_ioctl.c rbtree.c
+liblustreclass_a_SOURCES += lustre_handles.c lustre_peer.c lprocfs_status.c
+liblustreclass_a_SOURCES += obdo.c obd_config.c llog.c llog_obd.c llog_cat.c 
+liblustreclass_a_SOURCES += llog_lvfs.c llog_swab.c 
+liblustreclass_a_SOURCES += prng.c #llog_ioctl.c rbtree.c
 liblustreclass_a_CPPFLAGS = $(LLCPPFLAGS) -DLUSTRE_VERSION=\"32\" -DBUILD_VERSION=\"1\"
 liblustreclass_a_CFLAGS = $(LLCFLAGS)
 
 endif
 
+
 if MODULES
-modulefs_DATA = obdclass$(KMODEXT) confobd$(KMODEXT)
+
+if LINUX
+modulefs_DATA = obdclass$(KMODEXT)
 noinst_DATA = llog_test$(KMODEXT)
+endif # LINUX
+
+if DARWIN
+macos_PROGRAMS := obdclass
+
+obdclass_SOURCES := \
+        darwin/darwin-module.c darwin/darwin-sysctl.c          \
+        class_obd.c genops.c lprocfs_status.c                  \
+        lustre_handles.c lustre_peer.c obd_config.c            \
+        obdo.c debug.c llog_ioctl.c uuid.c prng.c               \
+        llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c
+
+obdclass_CFLAGS := $(EXTRA_KCFLAGS)
+obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
+obdclass_LDADD := $(EXTRA_KLIBS)
+
+plist_DATA := Info.plist
+
+install_data_hook := fix-kext-ownership
+
+endif # DARWIN
+
 endif # MODULES
 
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  llog-test.c 
-DIST_SOURCES = $(filter-out llog-test.c,$(obdclass-objs:.o=.c)) confobd.c llog_test.c
+install-data-hook: $(install_data_hook)
+
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  llog-test.c
+MOSTLYCLEANFILES += linux/*.o darwin/*.o
+DIST_SOURCES = $(filter-out llog-test.c,$(obdclass-all-objs:.o=.c)) $(llog-test-objs:.o=.c) llog_test.c llog_internal.h