Permalink
Browse files

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.
  • Loading branch information...
1 parent 9f700e9 commit bc0e8fe0441972fce7eb3bfba24c0cd9a52a4eee @leto leto committed Sep 23, 2012
Showing with 6 additions and 10 deletions.
  1. +0 −1 .gitignore
  2. +2 −5 .gitmodules
  3. +4 −4 Makefile
  4. 0 { → ext}/Rosella
View
1 .gitignore
@@ -11,5 +11,4 @@ src/Git2/Repository.pir
src/Git2/Index.pir
src/Git2/Oid.pir
src/Git2/Odb.pir
-rosella
tags
View
7 .gitmodules
@@ -1,6 +1,3 @@
-[submodule "rosella"]
- path = rosella
+[submodule "ext/Rosella"]
+ path = ext/Rosella
url = git://github.com/Whiteknight/Rosella
-[submodule "Rosella"]
- path = Rosella
- url = https://github.com/Whiteknight/Rosella.git
View
8 Makefile
@@ -15,9 +15,9 @@ pbclib: $(git2pbc) src/git2.pbc
%.pbc: %.pir
parrot -o $@ $<
-rosella: Rosella/Makefile
- $(MAKE) -C Rosella build
- ln -s Rosella/rosella rosella
+rosella: ext/Rosella/Makefile
+ $(MAKE) -C ext/Rosella build
+ 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
View
0 Rosella → ext/Rosella
File renamed without changes.

0 comments on commit bc0e8fe

Please sign in to comment.