X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=c78cbb39ed7608a052fc12c03a8e3570929c287d;hp=a6a8f90a6dabb732969d3d4edd3671bd4dfbfdfe;hb=c09b59bb958f3e089b95dd9492cc1bef17cb3782;hpb=72771797f8db15f3b8cce529fc6deb335c3b50d5

diff --git a/autoMakefile.am b/autoMakefile.am
index a6a8f90..c78cbb3 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,5 +1,18 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := ldiskfs @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre config contrib
+SUBDIRS := @LDISKFS_SUBDIR@ \
+	. \
+	@SNMP_SUBDIR@ \
+	@LUSTREIOKIT_SUBDIR@ \
+	@LIBCFS_SUBDIR@ \
+	lnet \
+	lustre
+
+DIST_SUBDIRS := ldiskfs \
+	@SNMP_DIST_SUBDIR@ \
+	lustre-iokit \
+	@LIBCFS_SUBDIR@ \
+	lnet \
+	lustre \
+	config contrib
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -64,7 +77,7 @@ all-am: modules
 modules: ldiskfs-sources lustre-sources module-symvers
 	$(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)	     \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
+	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
 	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
 	include/config/MARKER $@
 endif # LINUX