Commit 4ea33811e3346f292137a514c47a33e0d9c126a9

Thomas de Grivel 2023-11-14T23:28:38

configure Makefile

diff --git a/configure b/configure
index a3e7649..a2f4d0e 100755
--- a/configure
+++ b/configure
@@ -11,7 +11,7 @@
 ## AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
 ## THIS SOFTWARE.
 
-set -e
+set -e -v
 
 export SRC_TOP="$(pwd)"
 
@@ -35,10 +35,10 @@ echo "HAVE_ASAN = ${HAVE_ASAN}" >> ${CONFIG_MK}
 
 update_config_mk
 
-( set -ev; cd libffi; sh autogen.sh; MAKE="${GMAKE}" ./configure --prefix "${PREFIX}" --disable-multi-os-directory --disable-dependency-tracking; )
-( set -ev; cd libtommath && ./configure; )
-( set -ev; cd ucd2c      && ./configure; )
-( set -ev; cd libc3      && ./configure; )
-( set -ev; cd ic3        && ./configure; )
-( set -ev; cd c3s        && ./configure; )
-( set -ev; cd test       && ./configure; )
+( cd libffi; sh autogen.sh; MAKE="${GMAKE}" ./configure --prefix "${PREFIX}" --disable-multi-os-directory --disable-dependency-tracking; )
+( cd libtommath; ./configure; )
+( cd ucd2c     ; ./configure; )
+( cd libc3     ; ./configure; )
+( cd ic3       ; ./configure; )
+( cd c3s       ; ./configure; )
+( cd test      ; ./configure; )
diff --git a/libc3/window/cairo/quartz/Makefile b/libc3/window/cairo/quartz/Makefile
index 392d5d1..4c7f5be 100644
--- a/libc3/window/cairo/quartz/Makefile
+++ b/libc3/window/cairo/quartz/Makefile
@@ -19,6 +19,7 @@ CLEANFILES += ${CLEANFILES_COV}
 DISTCLEANFILES = ${CLEANFILES} config.h config.mk
 
 build: libc3_window_cairo_quartz.la
+	${MAKE} -C demo build
 
 all:
 	${MAKE} build
@@ -27,21 +28,34 @@ all:
 	if ${HAVE_ASAN}; then ${MAKE} asan; fi
 
 asan: libc3_window_cairo_quartz_asan.la
+	${MAKE} -C demo asan
 
 clean:
 	rm -rf ${CLEANFILES}
+	${MAKE} -C demo clean
 
 clean_cov:
 	rm -rf ${CLEANFILES_COV}
+	${MAKE} -C demo clean_cov
 
 cov: libc3_window_cairo_quartz_cov.la
+	${MAKE} -C demo cov
 
 debug: libc3_window_cairo_quartz_debug.la
+	${MAKE} -C demo debug
+
+demo: build
+	${MAKE} -C demo demo
 
 distclean:
 	rm -rf ${DISTCLEANFILES}
+	${MAKE} -C demo distclean
+
+gdb_demo: debug
+	${MAKE} -C demo gdb_demo
 
-test:
+test: build
+	${MAKE} -C demo test
 
 update_sources:
 	./update_sources
@@ -53,7 +67,9 @@ update_sources:
 	clean \
 	cov \
 	debug \
+	demo \
 	distclean \
+	gdb_demo \
 	gen \
 	install \
 	test \
diff --git a/libc3/window/cairo/xcb/Makefile b/libc3/window/cairo/xcb/Makefile
index ed9bbc9..f7adfa9 100644
--- a/libc3/window/cairo/xcb/Makefile
+++ b/libc3/window/cairo/xcb/Makefile
@@ -19,6 +19,7 @@ CLEANFILES += ${CLEANFILES_COV}
 DISTCLEANFILES = ${CLEANFILES} config.h config.mk
 
 build: libc3_window_cairo_xcb.la
+	${MAKE} -C demo build
 
 all:
 	${MAKE} build
@@ -27,21 +28,34 @@ all:
 	if ${HAVE_ASAN}; then ${MAKE} asan; fi
 
 asan: libc3_window_cairo_xcb_asan.la
+	${MAKE} -C demo asan
 
 clean:
 	rm -rf ${CLEANFILES}
+	${MAKE} -C demo clean
 
 clean_cov:
 	rm -rf ${CLEANFILES_COV}
+	${MAKE} -C demo clean_cov
 
 cov: libc3_window_cairo_xcb_cov.la
+	${MAKE} -C demo cov
 
 debug: libc3_window_cairo_xcb_debug.la
+	${MAKE} -C demo debug
+
+demo: build
+	${MAKE} -C demo demo
 
 distclean:
 	rm -rf ${DISTCLEANFILES}
+	${MAKE} -C demo distclean
+
+gdb_demo: debug
+	${MAKE} -C demo gdb_demo
 
-test:
+test: build
+	${MAKE} -C demo test
 
 update_sources:
 	./update_sources
@@ -53,7 +67,9 @@ update_sources:
 	clean \
 	cov \
 	debug \
+	demo \
 	distclean \
+	gdb_demo \
 	gen \
 	install \
 	test \