From 2c95e88e40ff3cf021eb9e2e0b7a87f68d5e1e37 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 6 Mar 2020 15:11:55 -0500
Subject: meson using dub

- the good
  - works
  - project looks pretty clean
- the bad
  - subprojects built externally
  - not suitable for debian packaging
---
 makefile | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 9489c0f..8b23e43 100644
--- a/makefile
+++ b/makefile
@@ -93,31 +93,13 @@ all_ver: dmd_ver ldc_ver gdc_ver
 all_debug: dmd_debug gdc_debug ldc_debug
 meson_clean_build_dir:
 	rm -r build; mkdir build
-meson_get_subprojects: meson_clean_build_dir
-	rm -rf subprojects/d2sqlite3; rm -rf subprojects/imageformats
-	rm -rf subprojects/dyaml; rm -rf subprojects/tinyendian
-	git clone https://github.com/biozic/d2sqlite3.git subprojects/d2sqlite3
-	git clone https://github.com/lgvz/imageformats.git subprojects/imageformats
-	cd subprojects/d2sqlite3; \
-	git checkout -b add_meson_build_patch; \
-	cp ../d2sqlite3.meson.build meson.build; \
-	git add . ; git commit -m"project meson.build added"; \
-	cd ../..
-	cd subprojects/imageformats; \
-	git checkout -b add_meson_build_patch; \
-	cp ../imageformats.meson.build meson.build; \
-	git add . ; git commit -m"project meson.build added"; \
-	cd ../..
-mesonclean: clean skel tangle dub_upgrade
-	meson --buildtype=debugoptimized build
-	ninja -C build
 meson_build: meson_clean_build_dir
 	meson --buildtype=debugoptimized build
 	ninja -C build
 	notify-send -t 0 'D meson build ldc compiled test release executable ready' 'spine'
-meson_upgrade: dub_upgrade meson_get_subprojects
-meson_upgrade_and_build: dub_upgrade meson_get_subprojects meson_clean_build_dir meson_build
-meson: meson_clean_build_dir meson_build
+meson_redo: meson_clean_build_dir meson_build
+meson_project_build_clean: clean skel tangle dub_upgrade meson_build
+meson: meson_clean_build_dir dub_upgrade meson_build
 all_clean: clean tangle dmd ldc gdc
 all_ver_clean: clean tangle dmd_ver ldc_ver gdc_ver
 all_debug_ver: dmd_debug_ver gdc_debug_ver ldc_debug_ver
@@ -178,7 +160,6 @@ skel:
 	mkdir -p $(PRG_BINDIR); \
 	mkdir -p $(PRG_BINDIR)-archive; \
 	mkdir -p build; \
-	mkdir -p subprojects; \
 	mkdir -p views; \
 	mkdir -p data; \
 	mkdir -p util; \
@@ -192,7 +173,6 @@ skel:
 init: skel
 clean:
 	rm -rf build; \
-	rm -rf subprojects; \
 	rm -rf $(PRG_SRCDIR); \
 	rm -rf $(PRG_DOCDIR);
 clean_bin:
@@ -204,7 +184,6 @@ clean_docs:
 expunge:
 	rm -f dub.selections.json; \
 	rm -rf build; \
-	rm -rf subprojects; \
 	rm -rf $(PRG_SRCDIR); \
 	rm -rf $(PRG_BINDIR); \
 	rm -rf $(PRG_DOCDIR);
-- 
cgit v1.2.3