Branch HEAD

[fs/lustre-release.git] / build / autoMakefile.am.toplevel

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index f272ed8..3547b40 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -27,7 +27,7 @@ tags:
 if MODULES
 sources: all-sources
 
-all-sources:
+all-sources: $(EXTRA_SOURCES)
        for dir in $(SOURCES_SUBDIRS) ; do \
                $(MAKE) sources -C $$dir || exit $$? ; \
        done
@@ -51,9 +51,7 @@ endif # !LINUX25
 modules: $(DEP) all-sources
        $(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ)                \
        -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Iinclude               \
-        $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include)              \
-        -include include/linux/autoconf.h'                          \
+        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \
        $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
        include/config/MARKER $@
 endif # LINUX
@@ -61,6 +59,8 @@ endif # LINUX
 endif # MODULES
 
 dist-hook:
+       rm -f $(distdir)/ldiskfs/*.spec
+       rm -f $(distdir)/lustre-iokit/*.spec
        find $(distdir) -name .deps -o \
                        -name CVS -o \
                        -name .svn -o \