Start to unify build system #10

This moves the Rosella submodule so that it doesn't confuse filesystems which are case insensitive (puke). 3rd party code now lives in the ext/* subdir.
letolabs · Sep 23, 2012 · bc0e8fe · bc0e8fe
1 parent 9f700e9
commit bc0e8fe
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,5 +11,4 @@ src/Git2/Repository.pir
 src/Git2/Index.pir
 src/Git2/Oid.pir
 src/Git2/Odb.pir
-rosella
 tags
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "rosella"]
+[submodule "ext/Rosella"]
-	path = rosella
+	path = ext/Rosella
 	url = git://github.com/Whiteknight/Rosella
-[submodule "Rosella"]
-	path = Rosella
-	url = https://github.com/Whiteknight/Rosella.git
diff --git a/Makefile b/Makefile
@@ -15,9 +15,9 @@ pbclib: $(git2pbc) src/git2.pbc
 %.pbc: %.pir
 	parrot -o $@ $<
 
-rosella: Rosella/Makefile
+rosella: ext/Rosella/Makefile
-	$(MAKE) -C Rosella build
+	$(MAKE) -C ext/Rosella build
-	ln -s Rosella/rosella rosella
+	ln -s ext/Rosella/rosella rosella
 
 nci: src/git2.nci
 
@@ -27,7 +27,7 @@ src/git2.nci:
 	perl ./bin/header2nci.pl /usr/local/include/git2.h >> src/git2.nci ; \
 	for i in /usr/local/include/git2/*; do  perl ./bin/header2nci.pl $$i >> src/git2.nci ; done
 
-Rosella/Makefile:
+ext/Rosella/Makefile:
 	git submodule init
 	git submodule update
 

diff --git a/Rosella → ext/Rosella b/Rosella → ext/Rosella