From 77582c4c6804dade46cc7bf991f48b00e1391eff Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sun, 29 Aug 2021 13:24:03 +0200
Subject: Move getoptpp submodule into src as well.

---
 .gitmodules  | 2 +-
 bootstrap.sh | 4 +++-
 cppbuild.cc  | 2 +-
 getoptpp     | 1 -
 src/getoptpp | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 160000 getoptpp
 create mode 160000 src/getoptpp

diff --git a/.gitmodules b/.gitmodules
index 1c313f3..3e401a5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "getoptpp"]
-	path = getoptpp
+	path = src/getoptpp
 	url = git://git.drumgizmo.org/getoptpp.git
diff --git a/bootstrap.sh b/bootstrap.sh
index e1ee5eb..a232740 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,2 +1,4 @@
 #!/bin/bash
-g++ -std=c++17 -I. -Isrc -pthread src/*.cc cppbuild.cc -o cppbuild
+echo "Bootstrapping..."
+g++ -std=c++17 -I. -Isrc -pthread src/*.cc cppbuild.cc -o cppbuild && \
+echo "Done. Now run ./cppbuild to build."
diff --git a/cppbuild.cc b/cppbuild.cc
index dc3ab19..5c6d885 100644
--- a/cppbuild.cc
+++ b/cppbuild.cc
@@ -28,7 +28,7 @@ BuildConfigurations cppbuildConfigs()
 				"-s",
 				"-Wall",
 				"-Werror",
-				"-I.",
+				"-Isrc",
 			},
 		}
 	};
diff --git a/getoptpp b/getoptpp
deleted file mode 160000
index 9ff20ef..0000000
--- a/getoptpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9ff20ef857429619267e3f156a4f81ad9e1eb8c1
diff --git a/src/getoptpp b/src/getoptpp
new file mode 160000
index 0000000..9ff20ef
--- /dev/null
+++ b/src/getoptpp
@@ -0,0 +1 @@
+Subproject commit 9ff20ef857429619267e3f156a4f81ad9e1eb8c1
-- 
cgit v1.2.3