b=20748

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

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index f07df3e..873911b 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -19,21 +19,26 @@ etags:
        $(RM) $(top_srcdir)/TAGS
        ETAGSF=`etags --version | grep -iq exuberant && \
                echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
-       find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' |xargs etags $$ETAGSF -a
+       find $(top_srcdir) -name '*.[hc]'|grep -v "\.pc"|xargs etags $$ETAGSF -a
 
 ctags:
        $(RM) $(top_srcdir)/tags
        CTAGSF=`ctags --version | grep -iq exuberant && \
                echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
-       find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' |xargs ctags $$CTAGSF -a
+       find $(top_srcdir) -name '*.[hc]'|grep -v "\.pc"|xargs ctags $$CTAGSF -a
 
 cscope-recursive:
 
 cscope:
        $(RM) $(top_srcdir)/cscope*.out $(top_srcdir)/cscope.files
-       find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' > cscope.files
+       find $(top_srcdir) -name '*.[hc]' | grep -v "\.pc" > cscope.files
        cscope -bRq
 
+doxygen:  doxygen-api doxygen-ref
+
+doxygen-%: build/doxyfile.%
+          doxygen $<
+
 if MODULES
 sources: all-sources
 
@@ -61,7 +66,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) -I$$(srctree)/arch/$$(SRCARCH)/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
@@ -74,7 +79,11 @@ dist-hook:
        find $(distdir) -name .deps -o \
                        -name CVS -o \
                        -name .svn -o \
+                       -name .git -o \
                        -name .#* | xargs rm -rf
+       $(MAKE) $(AM_MAKEFLAGS) \
+         top_distdir="$(top_distdir)" distdir="$(distdir)" \
+         module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec                                    \
        build/Makefile build/autoMakefile.am.toplevel build/lbuild      \