X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2FautoMakefile.am;h=66b7c25c8c4659a2bb9034ddc2446efeb7bc7d99;hp=778dba02d6f86613ad112c78d97fa9587026e7e2;hb=12e311012ae337276dc3e7da3e7ad8d85d11e764;hpb=f96cc13e35a869b7bacc08b66a1981072a6cc310

diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am
index 778dba0..66b7c25 100644
--- a/lustre/obdclass/autoMakefile.am
+++ b/lustre/obdclass/autoMakefile.am
@@ -1,20 +1,17 @@
-SUBDIRS := linux
-if DARWIN
-SUBDIRS += darwin
-endif
-DIST_SUBDIRS := $(SUBDIRS)
+SUBDIRS = linux
+DIST_SUBDIRS = linux
 
 if LIBLUSTRE
-
 noinst_LIBRARIES = liblustreclass.a
-liblustreclass_a_SOURCES = class_obd.c debug.c genops.c statfs_pack.c mea.c uuid.c 
-liblustreclass_a_SOURCES += lustre_handles.c lustre_peer.c lprocfs_status.c class_hash.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 capa.c
-liblustreclass_a_SOURCES += lu_object.c lu_ref.c lu_time.c
+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
+liblustreclass_a_SOURCES += obdo.c obd_config.c llog.c llog_obd.c llog_cat.c
+liblustreclass_a_SOURCES += llog_swab.c capa.c lprocfs_counters.c
+liblustreclass_a_SOURCES += lu_object.c cl_object.c lu_ref.c
+liblustreclass_a_SOURCES += cl_page.c cl_lock.c cl_io.c
 liblustreclass_a_SOURCES += #llog_ioctl.c rbtree.c
-liblustreclass_a_CPPFLAGS = $(LLCPPFLAGS)
-liblustreclass_a_CFLAGS = $(LLCFLAGS)
+liblustreclass_a_CPPFLAGS = $(LLCPPFLAGS) -I$(SYSIO)/include
+liblustreclass_a_CFLAGS = $(LLCFLAGS) -I$(SYSIO)/include
 
 endif
 
@@ -23,34 +20,12 @@ if MODULES
 
 if LINUX
 modulefs_DATA = obdclass$(KMODEXT)
-noinst_DATA = llog_test$(KMODEXT)
+if TESTS
+modulefs_DATA += llog_test$(KMODEXT)
+endif # TESTS
 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                      \
-        llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c    \
-        mea.c lu_object.c dt_object.c hash.c lu_ref.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
 
-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
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
+MOSTLYCLEANFILES += linux/*.o