From 9bd93fe9c179784d7e4f5f62cfb01b25266c762d Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Wed, 7 Mar 2012 17:19:52 +0100
Subject: [PATCH] move third-party git checkouts into submodules #43

---
 .gitignore    | 6 ------
 .gitmodules   | 9 +++++++++
 Makefile      | 7 +------
 djvulibre     | 1 +
 luafilesystem | 1 +
 mupdf         | 1 +
 6 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 djvulibre
 create mode 160000 luafilesystem
 create mode 160000 mupdf

diff --git a/.gitignore b/.gitignore
index b15d2a355..f24e0285c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,16 +3,10 @@ lua
 lua-*
 lsqlite3*
 sqlite-amalgamation*
-mupdf/
-djvulibre/
-luafilesystem/
 .reader.kpdfview.lua
 kpdfview
-djvulibre*
 
 
 /.cproject
 /.project
 /.reader.kpdfview
-/luafilesystem
-/mupdf
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..77f6eecd4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "mupdf"]
+	path = mupdf
+	url = git://git.ghostscript.com/mupdf.git
+[submodule "luafilesystem"]
+	path = luafilesystem
+	url = git://github.com/keplerproject/luafilesystem.git
+[submodule "djvulibre"]
+	path = djvulibre
+	url = git://djvu.git.sourceforge.net/gitroot/djvu/djvulibre.git
diff --git a/Makefile b/Makefile
index bde046e89..b829c791c 100644
--- a/Makefile
+++ b/Makefile
@@ -95,15 +95,10 @@ lfs.o: $(LFSDIR)/src/lfs.c
 	$(CC) -c $(CFLAGS) -I$(LUADIR)/src -I$(LFSDIR)/src $(LFSDIR)/src/lfs.c -o $@
 
 fetchthirdparty:
-	-rm -Rf mupdf
 	-rm -Rf lua lua-5.1.4*
-	-rm -Rf luafilesystem*
-	-rm -Rf $(DJVUDIR)
-	git clone git://git.ghostscript.com/mupdf.git
+	git submodule update
 	( cd mupdf ; wget http://www.mupdf.com/download/mupdf-thirdparty.zip && unzip mupdf-thirdparty.zip )
 	wget http://www.lua.org/ftp/lua-5.1.4.tar.gz && tar xvzf lua-5.1.4.tar.gz && ln -s lua-5.1.4 lua
-	git clone https://github.com/keplerproject/luafilesystem.git
-	git clone git://djvu.git.sourceforge.net/gitroot/djvu/djvulibre.git
 
 clean:
 	-rm -f *.o kpdfview
diff --git a/djvulibre b/djvulibre
new file mode 160000
index 000000000..6c9aae4ba
--- /dev/null
+++ b/djvulibre
@@ -0,0 +1 @@
+Subproject commit 6c9aae4baccfac12f076b8317f3177c475c44e57
diff --git a/luafilesystem b/luafilesystem
new file mode 160000
index 000000000..149e0fb8e
--- /dev/null
+++ b/luafilesystem
@@ -0,0 +1 @@
+Subproject commit 149e0fb8ec6295325e1e448bbe79b7e9bf2285aa
diff --git a/mupdf b/mupdf
new file mode 160000
index 000000000..ea671d125
--- /dev/null
+++ b/mupdf
@@ -0,0 +1 @@
+Subproject commit ea671d1254dad3b9ef5a8fbdd9729c3ada2a49b2