Remove submodule references and update initialization

No effects were observed on Make-managed files.

Signed-off-by: Alex Nelson <[email protected]>

.gitmodules

@@ -2,9 +2,6 @@
 	path = deps/CASE-Examples
 	url = https://github.com/casework/CASE-Examples.git
 	branch = master
-[submodule "deps/case-implementation-plaso"]
-	path = deps/case-implementation-plaso
-	url = https://github.com/casework/case-implementation-plaso.git
 [submodule "deps/dfxml"]
 	path = deps/dfxml
 	url = https://github.com/dfxml-working-group/dfxml_python.git

Makefile

@@ -30,24 +30,15 @@ all: \
   setup
 
 # Removing this flag file checks for added or removed submodules, but does not cause a submodule update to occur on submodules that have already been checked out at least once.
-.git_submodule_init: \
-  .gitmodules
-	git submodule sync
-	test -r deps/case/.git || \
-	  (git submodule init deps/case && git submodule update deps/case)
-	test -r deps/case-api-python/.git || \
-	  (git submodule init deps/case-api-python && git submodule update deps/case-api-python)
-	test -r deps/case-implementation-plaso/.git || \
-	  (git submodule init deps/case-implementation-plaso && git submodule update deps/case-implementation-plaso)
-	test -r deps/dfxml/.git || \
-	  (git submodule init deps/dfxml && git submodule update deps/dfxml)
-	test -r deps/dfxml_schema/.git || \
-	  (git submodule init deps/dfxml_schema && git submodule update deps/dfxml_schema)
-	touch $@
-
 .git_submodule_init.done.log: \
   .gitmodules
-	git submodule update --init
+	test -r deps/CASE-Examples/Makefile || \
+	  git submodule update --init deps/CASE-Examples
+	test -r deps/dfxml/Makefile || \
+	  git submodule update --init deps/dfxml
+	$(MAKE) \
+	  --directory deps/dfxml \
+	  .git_submodule_init.done.log
 	touch $@
 
 # This virtual environment is meant to be built once and then persist, even through 'make clean'.
@@ -146,10 +137,6 @@ clean-tests:
 	  clean
 
 deps/dfxml/setup.cfg: \
-  .git_submodule_init
+  .git_submodule_init.done.log
 	touch -c $@
 	test -r $@
-
-setup: \
-  .setup_complete
-	@echo "Setup complete."

tests/Makefile

@@ -20,10 +20,10 @@ PYTHON3 ?= python3
 
 top_srcdir := $(shell cd .. ; pwd)
 
-dfxml_xsd := $(top_srcdir)/deps/dfxml_schema/dfxml.xsd
-
 dfxml_top_srcdir := $(top_srcdir)/deps/dfxml
 
+dfxml_xsd := $(dfxml_top_srcdir)/dependencies/dfxml_schema/dfxml.xsd
+
 objects_py_dependencies := \
   $(dfxml_top_srcdir)/dfxml/__init__.py \
   $(dfxml_top_srcdir)/dfxml/objects.py
@@ -48,10 +48,7 @@ all:
   check-basic \
   check-basic-TODO \
   check-case_examples \
-  check-case_implementation_plaso_examples \
-  check-case_implementation_plaso_examples-TODO \
   clean-case_examples \
-  clean-case_implementation_plaso_examples \
   check-cli \
   check-mypy \
   clean-recursive
@@ -86,13 +83,11 @@ check: \
   check-doctest \
   check-cli \
   check-package \
-  check-case_examples \
-  check-case_implementation_plaso_examples
+  check-case_examples
 	@echo "Unit tests pass!"
 
 check-TODO: \
-  check-basic-TODO \
-  check-case_implementation_plaso_examples-TODO
+  check-basic-TODO
 
 check-basic: \
   empty.json \
@@ -107,14 +102,6 @@ check-case_examples: \
   check-basic
 	$(MAKE) -C case_examples check
 
-check-case_implementation_plaso_examples: \
-  check-basic
-	$(MAKE) -C case_implementation_plaso_examples check
-
-check-case_implementation_plaso_examples-TODO: \
-  check-case_implementation_plaso_examples
-	$(MAKE) -C case_implementation_plaso_examples check-TODO
-
 check-cli: \
   .venv.done.log
 	$(MAKE) \
@@ -162,12 +149,8 @@ clean: \
 clean-case_examples:
 	$(MAKE) -C case_examples clean
 
-clean-case_implementation_plaso_examples:
-	$(MAKE) -C case_implementation_plaso_examples clean
-
 clean-recursive: \
-  clean-case_examples \
-  clean-case_implementation_plaso_examples
+  clean-case_examples
 
 empty.json: \
   .venv.done.log \

tests/case_examples/Makefile

@@ -18,21 +18,6 @@ SHELL = /bin/bash
 
 top_srcdir := ../..
 
-#BOOKMARK^
-dfxml_xsd := $(top_srcdir)/deps/dfxml_schema/dfxml.xsd
-
-dfxml_top_srcdir := $(top_srcdir)/deps/dfxml
-
-objects_py_dependencies := \
-  $(dfxml_top_srcdir)/dfxml/__init__.py \
-  $(dfxml_top_srcdir)/dfxml/objects.py
-
-case_to_dfxml_dependencies := \
-  $(objects_py_dependencies) \
-  $(top_srcdir)/case_to_dfxml.py
-
-#BOOKMARKv
-
 all:
 
 Oresteia.dfxml: \

tests/case_examples/example.mk

@@ -28,10 +28,10 @@ endif
 
 top_srcdir := ../..
 
-dfxml_xsd := $(top_srcdir)/deps/dfxml_schema/dfxml.xsd
-
 dfxml_top_srcdir := $(top_srcdir)/deps/dfxml
 
+dfxml_xsd := $(dfxml_top_srcdir)/dependencies/dfxml_schema/dfxml.xsd
+
 objects_py_dependencies := \
   $(dfxml_top_srcdir)/dfxml/__init__.py \
   $(dfxml_top_srcdir)/dfxml/objects.py