Author: ankit
Date: 2007-08-22 06:40:06 -0400 (Wed, 22 Aug 2007)
New Revision: 84607
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.noauto.project.template
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.solution.template
Log:
* templates/Makefile.solution.template: Replace all *-recursive targets
with a single %-recursive target.
* templates/*: minor updates.
* SimpleProjectMakefileHandler.cs: Update.
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2007-08-22
10:40:04 UTC (rev 84606)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2007-08-22
10:40:06 UTC (rev 84607)
@@ -1,5 +1,12 @@
2007-08-22 Ankit Jain <[EMAIL PROTECTED]>
+ * templates/Makefile.solution.template: Replace all *-recursive targets
+ with a single %-recursive target.
+ * templates/*: minor updates.
+ * SimpleProjectMakefileHandler.cs: Update.
+
+2007-08-22 Ankit Jain <[EMAIL PROTECTED]>
+
* templates/*: Improve generated makefiles to support '-k'.
2007-08-21 Ankit Jain <[EMAIL PROTECTED]>
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
2007-08-22 10:40:04 UTC (rev 84606)
+++
trunk/monodevelop/Extras/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
2007-08-22 10:40:06 UTC (rev 84607)
@@ -381,6 +381,7 @@
templateEngine.Variables["DEPLOY_FILE_VARS"] =
vars.ToString ();
templateEngine.Variables["COPY_DEPLOY_FILES_VARS"] =
deployFileCopyVars.ToString();
templateEngine.Variables["COPY_DEPLOY_FILES_TARGETS"] =
deployFileCopyTargets.ToString();
+ templateEngine.Variables["ALL_TARGET"] =
(ctx.TargetCombine.BaseDirectory == project.BaseDirectory) ? "all-local" :
"all";
templateEngine.Variables["FILES"] =
files.ToString();
templateEngine.Variables["RESOURCES"] =
res_files.ToString();
@@ -584,7 +585,7 @@
installTarget.AppendFormat ("\ttest -z '$({0})'
|| cp $({0}) {1}\n", targetDeployVar, installDir);
installDeps.AppendFormat (" $({0})",
targetDeployVar);
- uninstallTarget.AppendFormat ("\trm -f
{0}/$(notdir $({1}))\n", installDir, targetDeployVar);
+ uninstallTarget.AppendFormat ("\ttest -z
'$({1})' || rm -f {0}/$(notdir $({1}))\n", installDir, targetDeployVar);
}
}
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.noauto.project.template
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.noauto.project.template
2007-08-22 10:40:04 UTC (rev 84606)
+++
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.noauto.project.template
2007-08-22 10:40:06 UTC (rev 84607)
@@ -19,7 +19,7 @@
CLEANFILES += %%CLEANFILES%%
#Targets
-all-local: $(ASSEMBLY) %%DEPLOY_FILE_VARS%% $(top_srcdir)/config.make
+%%ALL_TARGET%%: $(ASSEMBLY) %%DEPLOY_FILE_VARS%% $(top_srcdir)/config.make
%%COPY_DEPLOY_FILES_TARGETS%%
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.solution.template
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.solution.template
2007-08-22 10:40:04 UTC (rev 84606)
+++
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.solution.template
2007-08-22 10:40:06 UTC (rev 84607)
@@ -4,14 +4,14 @@
CONFIG_MAKE=$(top_srcdir)/config.make
-all-recursive: $(CONFIG_MAKE)
+%-recursive: $(CONFIG_MAKE)
@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 || { final_exit="exit 1"; $$dk; };;\
- *) (cd $$dir && make) || { final_exit="exit 1"; $$dk; };;\
+ .) make $*-local || { final_exit="exit 1"; $$dk; };;\
+ *) (cd $$dir && make $*) || { final_exit="exit 1"; $$dk; };;\
esac \
done
$$final_exit
@@ -21,45 +21,6 @@
exit 1
clean: clean-recursive
-
-clean-recursive:
- @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 || { final_exit="exit 1"; $$dk; };;\
- *) (cd $$dir && make clean) || { final_exit="exit 1"; $$dk; };;\
- esac \
- done
- $$final_exit
-
install: install-recursive
-
-install-recursive:
- @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 || { final_exit="exit 1"; $$dk; };;\
- *) (cd $$dir && make install) || { final_exit="exit 1"; $$dk;
};;\
- esac \
- done
- $$final_exit
-
-
uninstall: uninstall-recursive
-uninstall-recursive:
- @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 || { final_exit="exit 1"; $$dk; };;\
- *) (cd $$dir && make uninstall) || { final_exit="exit 1"; $$dk;
};;\
- esac \
- done
- $$final_exit
-
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
