[toc-cvstree] SF.net SVN: toc:[118] trunk/toc2/make

[<sg...@us...>]

Revision: 118
          http://toc.svn.sourceforge.net/toc/?rev=118&view=rev
Author:   sgbeal
Date:     2008-09-24 15:06:35 +0000 (Wed, 24 Sep 2008)

Log Message:
-----------
i think i've got parallel builds working now :)

Modified Paths:
--------------
    trunk/toc2/make/symlink-files.make
    trunk/toc2/make/toc2-subdirs.make

Modified: trunk/toc2/make/symlink-files.make
===================================================================
--- trunk/toc2/make/symlink-files.make	2008-09-21 12:11:23 UTC (rev 117)
+++ trunk/toc2/make/symlink-files.make	2008-09-24 15:06:35 UTC (rev 118)
@@ -18,14 +18,19 @@
 $(error You must define both symlink-files.dest before including this makefile.)
 endif
 
+symlink-files.dest.list := $(addprefix $(symlink-files.dest)/,$(symlink-files.list))
 symlink-files.makefile := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-
-symlink-files: FORCE
-	@$(call toc2.call.install-symlink,$(symlink-files.list),$(symlink-files.dest),-m 0644)
+$(symlink-files.makefile):
+$(symlink-files.dest.list):
+	@$(call toc2.call.install-symlink,$(notdir $@),$(symlink-files.dest),-m 0644)
+#	@echo "Symlinking $@"; test -L "$@" && rm "$@"; ln -s "$${PWD}/$(notdir $@)" "$@"
+symlink-files: $(symlink-files.dest.list)
+#	@$(call toc2.call.install-symlink,$(symlink-files.list),$(symlink-files.dest),-m 0644)
 symlink-files.list: symlink-files
 symlink-files-clean: FORCE
 	@echo "Cleaning symlinks."
-	@-touch foo.cleanlocal; rm foo.cleanlocal $(wildcard $(addprefix $(symlink-files.dest)/,$(symlink-files.list)))
+	@-touch foo.cleanlocal; rm foo.cleanlocal $(wildcard $(symlink-files.dest.list))
 
+.PHONY: symlink-files-clean symlink-files
 clean-.: symlink-files-clean
 distclean-.: symlink-files-clean

Modified: trunk/toc2/make/toc2-subdirs.make
===================================================================
--- trunk/toc2/make/toc2-subdirs.make	2008-09-21 12:11:23 UTC (rev 117)
+++ trunk/toc2/make/toc2-subdirs.make	2008-09-24 15:06:35 UTC (rev 118)
@@ -51,11 +51,11 @@
 		cd $$pwd || exit; \
 	done
 
-.PHONY: subdirs $(package.subdirs)
+.PHONY: subdirs $(package.subdirs) $(patsubst %,subdir-%,$(package.subdirs))
 $(package.subdirs):
-	@$(call toc2.call.make-subdirs,$@,all)
+	@+$(call toc2.call.make-subdirs,$@,all)
 subdirs: $(package.subdirs)
 subdir-%:# run all in subdir $*
-	@$(call toc2.call.make-subdirs,$*,all)
+	@+$(call toc2.call.make-subdirs,$*,all)
 subdirs-%:# run target % in $(package.subdirs)
-	@$(call toc2.call.make-subdirs,$(package.subdirs),$*)
+	@+$(call toc2.call.make-subdirs,$(package.subdirs),$*)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.