From 3b474c72073ec8cbb3c6445fd192514d0a75655a Mon Sep 17 00:00:00 2001
From: Daniel Falster <daniel.falster@mq.edu.au>
Date: Thu, 12 Sep 2013 13:05:17 +1000
Subject: [PATCH] remove extra Makefil in R/metadata

---
 R/metadata/Makefile    | 10 ----------
 docs/Makefile          |  8 +++++++-
 docs/metadata/Makefile |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 R/metadata/Makefile

diff --git a/R/metadata/Makefile b/R/metadata/Makefile
deleted file mode 100644
index 1a310a0..0000000
--- a/R/metadata/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-SITES := BCI Canada France Fushan NSW NVS Paracou Spain Sweden Swiss US 
-OBJDIR := ../../docs/metadata/sites
-OBJS := $(addsuffix .md, $(addprefix $(OBJDIR)/, $(SITES))) 
-     
-all: $(OBJS)
-
-%.md:
-	Rscript knit_site_description.R $@
-	
-.PHONY: all 
diff --git a/docs/Makefile b/docs/Makefile
index dfad497..520ff80 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,4 +1,4 @@
-all: analysis agenda
+all: analysis agenda metadata
 	
 analysis:
 	make -C analysis.plan
@@ -6,4 +6,10 @@ analysis:
 agenda:
 	make -C meeting.agenda
 
+metadata:
+	make -C metadata
+	
+clean:
+	
+	
 .PHONY: all base metadata clean
diff --git a/docs/metadata/Makefile b/docs/metadata/Makefile
index d23ebd3..d285f63 100644
--- a/docs/metadata/Makefile
+++ b/docs/metadata/Makefile
@@ -5,7 +5,7 @@ PDF := $(addsuffix .pdf, $(addprefix sites/, $(SITES)))
 all: $(MD) $(PDF) sites/all.pdf
 
 $(MD):
-	make -C ../../R/metadata	
+	cd ../../R/metadata; Rscript knit_site_description.R $(addprefix ../../docs/metadata/, $@)
 
 sites/all.md: $(MD)
 	cat $(MD) > sites/all.md
-- 
GitLab