Skip to content
Snippets Groups Projects
Commit 24213ad3 authored by Andreas Dilger's avatar Andreas Dilger
Browse files

Branch b1_6

Use $RM macro for portability.
Make it more clear when sub-makes are finished.
parent 92183fa4
No related branches found
No related tags found
No related merge requests found
...@@ -14,12 +14,12 @@ tags-recursive: ...@@ -14,12 +14,12 @@ tags-recursive:
TAGS: TAGS:
tags: tags:
rm -f $(top_srcdir)/TAGS $(RM) $(top_srcdir)/TAGS
ETAGSF=`etags --version | grep -iq exuberant && \ ETAGSF=`etags --version | grep -iq exuberant && \
echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \ echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' |xargs etags $$ETAGSF -a find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' |xargs etags $$ETAGSF -a
rm -f $(top_srcdir)/tags $(RM) $(top_srcdir)/tags
CTAGSF=`ctags --version | grep -iq exuberant && \ CTAGSF=`ctags --version | grep -iq exuberant && \
echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \ echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' |xargs ctags $$CTAGSF -a find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' |xargs ctags $$CTAGSF -a
...@@ -59,8 +59,8 @@ endif # LINUX ...@@ -59,8 +59,8 @@ endif # LINUX
endif # MODULES endif # MODULES
dist-hook: dist-hook:
rm -f $(distdir)/ldiskfs/*.spec $(RM) $(distdir)/ldiskfs/*.spec
rm -f $(distdir)/lustre-iokit/*.spec $(RM) $(distdir)/lustre-iokit/*.spec
find $(distdir) -name .deps -o \ find $(distdir) -name .deps -o \
-name CVS -o \ -name CVS -o \
-name .svn -o \ -name .svn -o \
...@@ -89,6 +89,7 @@ rpms: ...@@ -89,6 +89,7 @@ rpms:
for subdir in $(RPM_SUBDIRS) ; do \ for subdir in $(RPM_SUBDIRS) ; do \
echo "Making rpms in $$subdir"; \ echo "Making rpms in $$subdir"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) rpms); \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) rpms); \
echo "Finished rpms in $$subdir"; \
done; \ done; \
$(MAKE) $(AM_MAKEFLAGS) rpms-real $(MAKE) $(AM_MAKEFLAGS) rpms-real
...@@ -96,6 +97,7 @@ srpm: ...@@ -96,6 +97,7 @@ srpm:
for subdir in $(RPM_SUBDIRS) ; do \ for subdir in $(RPM_SUBDIRS) ; do \
echo "Making srpm in $$subdir"; \ echo "Making srpm in $$subdir"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) srpm); \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) srpm); \
echo "Finished srpms in $$subdir"; \
done; \ done; \
$(MAKE) $(AM_MAKEFLAGS) srpm-real $(MAKE) $(AM_MAKEFLAGS) srpm-real
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment