Author: ankit
Date: 2007-08-22 06:40:04 -0400 (Wed, 22 Aug 2007)
New Revision: 84606
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.solution.template
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/make-dist.targets
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/rules.make
Log:
* templates/*: Improve generated makefiles to support '-k'.
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2007-08-22
10:36:47 UTC (rev 84605)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2007-08-22
10:40:04 UTC (rev 84606)
@@ -1,3 +1,7 @@
+2007-08-22 Ankit Jain <[EMAIL PROTECTED]>
+
+ * templates/*: Improve generated makefiles to support '-k'.
+
2007-08-21 Ankit Jain <[EMAIL PROTECTED]>
* ConfigSection.cs: New.
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.solution.template
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.solution.template
2007-08-22 10:36:47 UTC (rev 84605)
+++
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.solution.template
2007-08-22 10:40:04 UTC (rev 84606)
@@ -5,12 +5,16 @@
CONFIG_MAKE=$(top_srcdir)/config.make
all-recursive: $(CONFIG_MAKE)
- @for dir in $(SUBDIRS); do \
+ @set . $$MAKEFLAGS; final_exit=:; \
+ case $$2 in --unix) shift ;; esac; \
+ case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
+ for dir in $(SUBDIRS); do \
case $$dir in \
- .) make all-local ;; \
- *) (cd $$dir && make) || exit 1;;\
+ .) make all-local || { final_exit="exit 1"; $$dk; };;\
+ *) (cd $$dir && make) || { final_exit="exit 1"; $$dk; };;\
esac \
done
+ $$final_exit
$(CONFIG_MAKE):
echo "You must run configure first"
@@ -19,29 +23,43 @@
clean: clean-recursive
clean-recursive:
- [EMAIL PROTECTED] dir in $(SUBDIRS); do \
+ @set . $$MAKEFLAGS; final_exit=:; \
+ case $$2 in --unix) shift ;; esac; \
+ case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
+ for dir in $(SUBDIRS); do \
case $$dir in \
- .) make clean-local ;; \
- *) (cd $$dir && make clean) ;;\
+ .) make clean-local || { final_exit="exit 1"; $$dk; };;\
+ *) (cd $$dir && make clean) || { final_exit="exit 1"; $$dk; };;\
esac \
done
+ $$final_exit
install: install-recursive
install-recursive:
- @for dir in $(SUBDIRS); do \
+ @set . $$MAKEFLAGS; final_exit=:; \
+ case $$2 in --unix) shift ;; esac; \
+ case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
+ for dir in $(SUBDIRS); do \
case $$dir in \
- .) make install-local ;; \
- *) (cd $$dir && make install) || exit 1;;\
+ .) make install-local || { final_exit="exit 1"; $$dk; };;\
+ *) (cd $$dir && make install) || { final_exit="exit 1"; $$dk;
};;\
esac \
- done
+ done
+ $$final_exit
+
uninstall: uninstall-recursive
uninstall-recursive:
- @for dir in $(SUBDIRS); do \
+ @set . $$MAKEFLAGS; final_exit=:; \
+ case $$2 in --unix) shift ;; esac; \
+ case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
+ for dir in $(SUBDIRS); do \
case $$dir in \
- .) make uninstall-local ;; \
- *) (cd $$dir && make uninstall) ;;\
+ .) make uninstall-local || { final_exit="exit 1"; $$dk; };;\
+ *) (cd $$dir && make uninstall) || { final_exit="exit 1"; $$dk;
};;\
esac \
- done
+ done
+ $$final_exit
+
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/make-dist.targets
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/make-dist.targets
2007-08-22 10:36:47 UTC (rev 84605)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/make-dist.targets
2007-08-22 10:40:04 UTC (rev 84606)
@@ -2,11 +2,11 @@
rm -rf $(PACKAGE)-$(VERSION)
mkdir $(PACKAGE)-$(VERSION)
for dir in $(SUBDIRS); do \
- PACKAGE_DIR=`pwd`/$(PACKAGE)-$(VERSION); \
- mkdir $$PACKAGE_DIR/$$dir || true; \
+ pkgdir=`pwd`/$(PACKAGE)-$(VERSION); \
+ mkdir $$pkgdir/$$dir || true; \
case $$dir in \
- .) make distlocal distdir=$$PACKAGE_DIR;; \
- *) (cd $$dir; make distlocal distdir=$$PACKAGE_DIR/$$dir); \
+ .) make distlocal distdir=$$pkgdir || exit 1;; \
+ *) (cd $$dir; make distlocal distdir=$$pkgdir/$$dir) || exit
1;; \
esac \
done
(make distlocal distdir=$(PACKAGE)-$(VERSION))
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/rules.make
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/rules.make
2007-08-22 10:36:47 UTC (rev 84605)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/rules.make
2007-08-22 10:40:04 UTC (rev 84606)
@@ -10,14 +10,14 @@
d=`dirname "$$f"`; \
test -d "$(distdir)/$$d" || \
mkdir -p "$(distdir)/$$d"; \
- cp -p "$$f" "$(distdir)/$$d"; \
+ cp -p "$$f" "$(distdir)/$$d" || exit 1; \
done
distlocal-recursive:
for dir in $(SUBDIRS); do \
mkdir -p $(distdir)/$$dir || true; \
case $$dir in \
- .) make distlocal distdir=$(distdir);; \
- *) (cd $$dir; make distlocal distdir=$(distdir)/$$dir); \
+ .) make distlocal distdir=$(distdir) || exit 1;; \
+ *) (cd $$dir; make distlocal distdir=$(distdir)/$$dir) || exit
1; \
esac \
done
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
