From b660d52e619a50ae3192ad866c0f80f613745285 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 4 Sep 2016 00:54:41 +0200
Subject: [PATCH] build: update build files and add external git submodule.

---
 .gitignore        |  1 +
 .gitmodules       |  3 ++
 Makefile.am       |  2 +-
 bootstrap         |  3 ++
 configure.ac      | 72 +++--------------------------------------------
 external          |  1 +
 tools/Makefile.am |  3 --
 7 files changed, 13 insertions(+), 72 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 external

diff --git a/.gitignore b/.gitignore
index f11eaee6..ca6e3627 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,6 +98,7 @@ doc/tutorial/08_fbo
 doc/tutorial/11_fractal
 doc/tutorial/12_voronoi
 doc/tutorial/13_shader_builder
+doc/tutorial/14_lol_lua
 tools/make-font
 # Our data
 doc/doxygen.cfg
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..5d5acff8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "external"]
+	path = external
+	url = ../../lolengine/lol-external.git
diff --git a/Makefile.am b/Makefile.am
index d3f2bff7..51b6f28e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 include $(top_srcdir)/build/autotools/common.am
 
 # Put "people" at the end because they're more likely to break builds.
-SUBDIRS = build src tools demos games doc people
+SUBDIRS = build src tools doc
 DIST_SUBDIRS = $(SUBDIRS) binaries
 
 EXTRA_DIST += bootstrap COPYING TODO
diff --git a/bootstrap b/bootstrap
index 689c1837..567bc88e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -20,6 +20,9 @@ set -e
 sed -ne '/AC_CONFIG_FILES/,$p' configure.ac \
   | sed -ne 's@[^a-z]*\(.*/.*\)[^a-z]*@\1@p' | while read p; do
     case "$p" in
+        "")
+            continue
+            ;;
         *Makefile)
             required="${p}.am"
             ;;
diff --git a/configure.ac b/configure.ac
index d9f04df8..4a798d4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -470,12 +470,6 @@ AC_CONFIG_FILES(
   src/t/Makefile
   build/Makefile
   binaries/Makefile
-  people/Makefile
-  games/Makefile
-  demos/Makefile
-  tools/Makefile
-  tools/vimlol/Makefile
-  tools/vslol/Makefile
   doc/Makefile
   doc/doxygen.cfg
   doc/samples/Makefile
@@ -483,69 +477,11 @@ AC_CONFIG_FILES(
   doc/samples/meshviewer/Makefile
   doc/samples/sandbox/Makefile
   doc/tutorial/Makefile
-])
-AC_CONFIG_FILES(
- [games/monsterz/Makefile
-  games/mrpigeon/Makefile
-  games/orbital/Makefile
-  games/singlshot/Makefile
-  games/thonik/Makefile
-  games/sot3000/Makefile
-  games/grunx/Makefile
-  games/weshgrow/Makefile
-  games/allturdbeast/Makefile
-])
-AC_CONFIG_FILES(
- [games/deushax/Makefile
-  games/deushax/art/Makefile
-  games/deushax/art/test/Makefile
-  games/deushax/gfx/Makefile
-  games/deushax/maps/Makefile
-])
-AC_CONFIG_FILES(
- [games/abuse/Makefile
-  games/abuse/src/Makefile
-  games/abuse/data/Makefile
-  games/abuse/doc/Makefile
-  games/abuse/doc/abuse.6
-  games/abuse/doc/abuse-tool.6
-])
-AC_CONFIG_FILES(
- [demos/lol.js/Makefile
-])
-AC_CONFIG_FILES(
- [tools/lolremez/Makefile
+  tools/Makefile
+  tools/lolremez/Makefile
   tools/lolunit/Makefile
-  tools/neercs/Makefile
-  tools/pimp/Makefile
-  tools/zepto8/Makefile
-])
-AC_CONFIG_FILES(
- [people/jnat/Makefile
-  people/jnat/TestProject/Makefile
-  people/peeweek/Makefile
-  people/benlitz/Makefile
-  people/benlitz/test1/Makefile
-  people/benlitz/voxel/Makefile
-  people/benlitz/lolui/Makefile
-  people/touky/Makefile
-  people/touky/shared/Makefile
-  people/touky/sprite_sorter/Makefile
-  people/touky/squad_shooter/Makefile
-  people/touky/top_shooter/Makefile
-  people/touky/touky_demo/Makefile
-  people/touky/tactics/Makefile
-  people/touky/the_unfortunate_voronoid/Makefile
-  people/touky/workbench/Makefile
-  people/jylam/Makefile
-  people/jylam/private/Makefile
-  people/jylam/private/chat/Makefile
-  people/jylam/private/lander/Makefile
-  people/jylam/private/oric_convert/Makefile
-  people/sam/Makefile
-  people/sam/kanagawa/Makefile
-  people/sam/ld36/Makefile
-  people/sam/sapp/Makefile
+  tools/vimlol/Makefile
+  tools/vslol/Makefile
 ])
 
 AC_OUTPUT
diff --git a/external b/external
new file mode 160000
index 00000000..88ebbc99
--- /dev/null
+++ b/external
@@ -0,0 +1 @@
+Subproject commit 88ebbc99e2ed7e9f93b8e336dce7b1e08a776551
diff --git a/tools/Makefile.am b/tools/Makefile.am
index be622d96..fa7c4c09 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,11 +4,8 @@ include $(top_srcdir)/build/autotools/common.am
 SUBDIRS =
 SUBDIRS += lolremez
 SUBDIRS += lolunit
-SUBDIRS += neercs
-SUBDIRS += pimp
 SUBDIRS += vimlol
 SUBDIRS += vslol
-SUBDIRS += zepto8
 
 noinst_PROGRAMS = $(make_font)