Commit 1303f01c3b4dda2a13e05555a04e0bfdba672e37

Thomas de Grivel 2022-11-03T08:26:35

portable makefiles

diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
index e16610e..0000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-BMAKE = bmake -j4
-
-all:
-	${BMAKE} all
-
-clean:
-	${BMAKE} clean
-
-%:
-	${BMAKE} $@
-
-.PHONY: all clean
diff --git a/cli/Makefile b/cli/Makefile
index 307c897..80fbe3f 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -6,4 +6,4 @@ clean:
 
 .PHONY: all clean
 
-.include "config.mk"
+include config.mk
diff --git a/gtk3/Makefile b/gtk3/Makefile
index a242368..7a4bb06 100644
--- a/gtk3/Makefile
+++ b/gtk3/Makefile
@@ -18,4 +18,4 @@ CLEANFILES = rtbuf_gtk3_resources.c
 
 .PHONY: all clean
 
-.include "config.mk"
+include config.mk
diff --git a/lib/Makefile b/lib/Makefile
index 58dad3a..d27db63 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,4 +9,4 @@ install: libraries-install subdirs-install
 
 .PHONY: all clean libraries subdirs subdirs-clean subdirs-install
 
-.include "config.mk"
+include config.mk
diff --git a/lib/configure b/lib/configure
index b70aa4c..544dd30 100755
--- a/lib/configure
+++ b/lib/configure
@@ -80,19 +80,19 @@ done
 echo >> ${CONFIG_MK}
 echo "subdirs: ${TYPES}" >> ${CONFIG_MK}
 for DIR in $DIRS; do
-    echo "	\${MAKE} -C \${PWD}/$DIR" >> ${CONFIG_MK}
+    echo "	\${MAKE} -C $DIR" >> ${CONFIG_MK}
 done
 
 echo >> ${CONFIG_MK}
 echo "subdirs-clean:" >> ${CONFIG_MK}
 for DIR in $DIRS; do
-    echo "	\${MAKE} -C \${PWD}/$DIR clean" >> ${CONFIG_MK}
+    echo "	\${MAKE} -C $DIR clean" >> ${CONFIG_MK}
 done
 
 echo >> ${CONFIG_MK}
 echo "subdirs-install: libraries" >> ${CONFIG_MK}
 for DIR in $DIRS; do
-    echo "	\${MAKE} -C \${PWD}/$DIR install" >> ${CONFIG_MK}
+    echo "	\${MAKE} -C $DIR install" >> ${CONFIG_MK}
 done
 
 for DIR in $DIRS; do
diff --git a/lib/dynamic/Makefile b/lib/dynamic/Makefile
index 75a8bf5..b31aadb 100644
--- a/lib/dynamic/Makefile
+++ b/lib/dynamic/Makefile
@@ -5,4 +5,4 @@ clean:
 
 .PHONY: all clean libraries
 
-.include "config.mk"
+include config.mk
diff --git a/lib/glfw3/Makefile b/lib/glfw3/Makefile
index 0a11ac9..72976a3 100644
--- a/lib/glfw3/Makefile
+++ b/lib/glfw3/Makefile
@@ -5,4 +5,4 @@ clean:
 
 .PHONY: all clean libraries
 
-.include "config.mk"
+include config.mk
diff --git a/lib/portaudio/Makefile b/lib/portaudio/Makefile
index 0a11ac9..72976a3 100644
--- a/lib/portaudio/Makefile
+++ b/lib/portaudio/Makefile
@@ -5,4 +5,4 @@ clean:
 
 .PHONY: all clean libraries
 
-.include "config.mk"
+include config.mk
diff --git a/lib/reverb/Makefile b/lib/reverb/Makefile
index 0a11ac9..72976a3 100644
--- a/lib/reverb/Makefile
+++ b/lib/reverb/Makefile
@@ -5,4 +5,4 @@ clean:
 
 .PHONY: all clean libraries
 
-.include "config.mk"
+include config.mk
diff --git a/lib/signal/Makefile b/lib/signal/Makefile
index 0a11ac9..72976a3 100644
--- a/lib/signal/Makefile
+++ b/lib/signal/Makefile
@@ -5,4 +5,4 @@ clean:
 
 .PHONY: all clean libraries
 
-.include "config.mk"
+include config.mk
diff --git a/lib/sndio/Makefile b/lib/sndio/Makefile
index 0a11ac9..72976a3 100644
--- a/lib/sndio/Makefile
+++ b/lib/sndio/Makefile
@@ -5,4 +5,4 @@ clean:
 
 .PHONY: all clean libraries
 
-.include "config.mk"
+include config.mk
diff --git a/lib/synth/Makefile b/lib/synth/Makefile
index 0a11ac9..72976a3 100644
--- a/lib/synth/Makefile
+++ b/lib/synth/Makefile
@@ -5,4 +5,4 @@ clean:
 
 .PHONY: all clean libraries
 
-.include "config.mk"
+include config.mk
diff --git a/librtbuf/Makefile b/librtbuf/Makefile
index 3c9108b..0cecd9f 100644
--- a/librtbuf/Makefile
+++ b/librtbuf/Makefile
@@ -5,4 +5,4 @@ clean:
 
 .PHONY: all clean
 
-.include "config.mk"
+include config.mk