rtbuf/rtbuf

diff --git a/Makefile b/Makefile
index 7a77a63..df27d29 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
 all: build
 
 build:
-	${MAKE} -C librtbuf
-	${MAKE} -C lib
-	${MAKE} -C cli
-	${MAKE} -C gtk3
+	${MAKE} -C ${PWD}/librtbuf
+	${MAKE} -C ${PWD}/lib
+	${MAKE} -C ${PWD}/cli
+	${MAKE} -C ${PWD}/gtk3
 
 clean:
-	${MAKE} -C librtbuf clean
-	${MAKE} -C lib      clean
-	${MAKE} -C cli      clean
-	${MAKE} -C gtk3     clean
+	${MAKE} -C ${PWD}/librtbuf clean
+	${MAKE} -C ${PWD}/lib      clean
+	${MAKE} -C ${PWD}/cli      clean
+	${MAKE} -C ${PWD}/gtk3     clean
 
 install:
-	${MAKE} -C librtbuf install
-	${MAKE} -C lib      install
-	${MAKE} -C cli      install
-	${MAKE} -C gtk3     install
+	${MAKE} -C ${PWD}/librtbuf install
+	${MAKE} -C ${PWD}/lib      install
+	${MAKE} -C ${PWD}/cli      install
+	${MAKE} -C ${PWD}/gtk3     install
 
 .PHONY: all build clean install
diff --git a/cli/Makefile b/cli/Makefile
new file mode 100644
index 0000000..34da76b
--- /dev/null
+++ b/cli/Makefile
@@ -0,0 +1,9 @@
+
+all: rtbuf
+
+clean:
+	rm -rf .libs *.o *.lo *.la level120
+
+.PHONY: all clean
+
+.include "config.mk"
diff --git a/cli/cli.h b/cli/cli.h
index e589a38..5a9ad4d 100644
--- a/cli/cli.h
+++ b/cli/cli.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Thomas de Grivel <thoxdg@gmail.com>
+ * Copyright 2018-2021 Thomas de Grivel <thoxdg@gmail.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/cli/configure b/cli/configure
new file mode 100755
index 0000000..e0f61f3
--- /dev/null
+++ b/cli/configure
@@ -0,0 +1,44 @@
+#!/bin/sh
+set -e
+
+. ../config.subr
+
+PROG=rtbuf
+
+SOURCES="$(ls *.c | tr '\n' ' ')"
+echo "SOURCES = $SOURCES" >> ${CONFIG_MK}
+
+OBJECTS="$(c2o "$SOURCES")"
+echo "OBJECTS = $OBJECTS" >> ${CONFIG_MK}
+
+CPPFLAGS=
+if test -d /usr/local/include; then
+    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+fi
+echo "CPPFLAGS = $CPPFLAGS" >> ${CONFIG_MK}
+
+if [ x"$DEBUG" = x"yes" ]; then
+    CFLAGS="-DDEBUG -O0 -ggdb"
+else
+    CFLAGS="-DNDEBUG -O3"
+fi
+CFLAGS="$CFLAGS -W -Wall -Werror -std=c89 -pedantic"
+CFLAGS="$CFLAGS"
+echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
+
+LDFLAGS="-pthread"
+echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
+
+LIBS="../librtbuf/librtbuf.la -lreadline"
+echo "LIBS = $LIBS" >> ${CONFIG_MK}
+
+for SRC in $SOURCES; do
+    SRC_O=$(c2o $SRC)
+    echo >> ${CONFIG_MK}
+    o_rule $SRC >> ${CONFIG_MK}
+    echo "\t\${CC} \${CPPFLAGS} \${CFLAGS} -c $SRC -o $SRC_O" >> ${CONFIG_MK}
+done
+
+echo >> ${CONFIG_MK}
+echo "$PROG: $OBJECTS" >> ${CONFIG_MK}
+echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} \${LDFLAGS} \${OBJECTS} \${LIBS} -o $PROG" >> ${CONFIG_MK}
diff --git a/cli/include/rtbuf/cli.h b/cli/include/rtbuf/cli.h
deleted file mode 100644
index 32df681..0000000
--- a/cli/include/rtbuf/cli.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2020 Thomas de Grivel <thoxdg@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef RTBUF_CLI_H
-#define RTBUF_CLI_H
-
-#include <pthread.h>
-
-typedef void (*f_rtbuf_position) (s_rtbuf *rtb, short x, short y);
-
-extern f_rtbuf_position g_rtbuf_position_cb;
-extern pthread_t g_rtbuf_cli_run_thread;
-
-int rtbuf_cli_exit (int argc, const char *argv[]);
-void repl_init ();
-int load (const char *path);
-int repl ();
-void rtbuf_cli_args (int argc, char *argv[]);
-
-int rtbuf_cli_start ();
-int rtbuf_cli_stop ();
-
-int rtbuf_cli_do_event ();
-
-#endif /* RTBUF_CLI_H */
diff --git a/cli/rtbuf_cli.c b/cli/rtbuf_cli.c
index 2ea9045..f56cdd1 100644
--- a/cli/rtbuf_cli.c
+++ b/cli/rtbuf_cli.c
@@ -21,11 +21,11 @@
 #include <string.h>
 #include <unistd.h>
 #include "cli.h"
-#include <rtbuf/symbol.h>
-#include <rtbuf/rtbuf.h>
-#include <rtbuf/lib.h>
-#include <rtbuf/var.h>
-#include <rtbuf/cli.h>
+#include "../librtbuf/symbol.h"
+#include "../librtbuf/rtbuf.h"
+#include "../librtbuf/lib.h"
+#include "../librtbuf/var.h"
+#include "rtbuf_cli.h"
 
 s_cli            g_cli;
 pthread_t        g_rtbuf_cli_run_thread = 0;
@@ -35,7 +35,8 @@ int rtbuf_cli_libs (int argc, const char *argv[])
 {
   unsigned int i = 0;
   unsigned int n = g_rtbuf_lib_alloc.n - g_rtbuf_lib_alloc.free_n;
-  assert(argc == 0);
+  if (argc != 0)
+    return rtbuf_err("usage: libs");
   (void) argv;
   printf("Listing %i libraries :\n", n);
   while (i < g_rtbuf_lib_alloc.n && n > 0) {
@@ -64,7 +65,8 @@ int rtbuf_cli_lib (int argc, const char *argv[])
 int rtbuf_cli_load (int argc, const char *argv[])
 {
   s_rtbuf_lib *lib;
-  assert(argc == 1);
+  if (argc != 1)
+    return rtbuf_err("usage: load LIBRARY");
   lib = rtbuf_lib_load(argv[1]);
   if (!lib) {
     printf("load failed\n");
@@ -78,7 +80,8 @@ int rtbuf_cli_buffers (int argc, const char *argv[])
 {
   unsigned int i = 0;
   unsigned int n = g_rtbuf_alloc.n;
-  assert(argc == 0);
+  if (argc != 0)
+    return rtbuf_err("usage: buffers");
   (void) argv;
   printf("Listing %i buffers :\n", n);
   while (i < RTBUF_MAX && n > 0) {
diff --git a/cli/rtbuf_cli.h b/cli/rtbuf_cli.h
new file mode 100644
index 0000000..70bc029
--- /dev/null
+++ b/cli/rtbuf_cli.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020-2021 Thomas de Grivel <thoxdg@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef RTBUF_CLI_H
+#define RTBUF_CLI_H
+
+#include <pthread.h>
+
+typedef void (*f_rtbuf_position) (s_rtbuf *rtb, short x, short y);
+
+extern f_rtbuf_position g_rtbuf_position_cb;
+extern pthread_t g_rtbuf_cli_run_thread;
+
+int rtbuf_cli_exit (int argc, const char *argv[]);
+void repl_init ();
+int load (const char *path);
+int repl ();
+void rtbuf_cli_args (int argc, char *argv[]);
+
+int rtbuf_cli_start ();
+int rtbuf_cli_stop ();
+
+int rtbuf_cli_do_event ();
+
+#endif /* RTBUF_CLI_H */
diff --git a/cli/rtbuf_cli_main.c b/cli/rtbuf_cli_main.c
index cced2b6..6684a15 100644
--- a/cli/rtbuf_cli_main.c
+++ b/cli/rtbuf_cli_main.c
@@ -15,8 +15,8 @@
  */
 
 #include <assert.h>
-#include <rtbuf/rtbuf.h>
-#include <rtbuf/cli.h>
+#include "../librtbuf/rtbuf.h"
+#include "rtbuf_cli.h"
 
 int main (int argc, char *argv[])
 {
diff --git a/config.subr b/config.subr
index fa2a3ab..004f80c 100644
--- a/config.subr
+++ b/config.subr
@@ -2,12 +2,16 @@
 
 VER=0.4
 
+o_rule() {
+    $CC $CPPFLAGS -M "$1"
+}
+
 lo_rule() {
-    $CC $CPPFLAGS -M "$1" | sed -e 's/[.]o:/.lo:/'
+    o_rule "$1" | sed -e 's/[.]o:/.lo:/'
 }
 
 prog_rule() {
-    $CC $CPPFLAGS -M "$1" | sed -e 's/[.]o:/:/'
+    o_rule "$1" | sed -e 's/[.]o:/:/'
 }
 
 c2prog() {
diff --git a/configure b/configure
index 7c736e6..8b15833 100755
--- a/configure
+++ b/configure
@@ -3,8 +3,8 @@ set -e
 
 . ./config.subr
 
-(cd librtbuf && ./configure)
-(cd lib && ./configure)
-(cd cli && ./configure)
-(cd gtk3 && ./configure)
-(cd test && ./configure)
+(cd librtbuf && pwd && ./configure)
+(cd lib && pwd && ./configure)
+(cd cli && pwd && ./configure)
+#(cd gtk3 && pwd && ./configure)
+#(cd test && pwd && ./configure)
diff --git a/lib/Makefile b/lib/Makefile
index 4105a1e..4857776 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,4 +9,4 @@ 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 70c6709..816943e 100755
--- a/lib/configure
+++ b/lib/configure
@@ -26,6 +26,12 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
+LIBS=""
+echo "LIBS = $LIBS" >> ${CONFIG_MK}
+
+LIBDIR=/usr/local/lib
+echo "LIBDIR = $LIBDIR" >> ${CONFIG_MK}
+
 TYPES=
 
 for TYPE_SRC in $TYPE_SOURCES; do
@@ -51,9 +57,6 @@ for TYPE_SRC in $TYPE_SOURCES; do
     echo "CLEANFILES += $TYPE_PROG $TYPE_H" >> ${CONFIG_MK}
 done
 
-LIBDIR=/usr/local/lib
-echo "LIBDIR = $LIBDIR" >> ${CONFIG_MK}
-
 LIBRARIES=
 
 for SRC in $SOURCES; do
@@ -65,7 +68,7 @@ for SRC in $SOURCES; do
     SRC_LA="librtbuf_$(c2la "$SRC")"
     echo >> ${CONFIG_MK}
     echo "$SRC_LA: $SRC_LO" >> ${CONFIG_MK}
-    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -shared \${LDFLAGS} $SRC_LO -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
+    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -shared \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
     LIBRARIES="$LIBRARIES $SRC_LA"
 done
 
@@ -87,9 +90,8 @@ done
 echo >> ${CONFIG_MK}
 echo "subdirs-install:" >> ${CONFIG_MK}
 for DIR in $DIRS; do
-    echo "\t\${MAKE} -C $DIR install" >> ${CONFIG_MK}
-    echo $PWD/$DIR
-    (cd $DIR && ./configure)
+    echo "\t\${MAKE} -C \${PWD}/$DIR install" >> ${CONFIG_MK}
+    (cd $DIR && pwd && ./configure)
 done
 
 for TYPE_SRC in $TYPE_SOURCES; do
diff --git a/lib/dynamic/Makefile b/lib/dynamic/Makefile
index 7495f63..75a8bf5 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/dynamic/configure b/lib/dynamic/configure
index c9b888a..f3d63a2 100755
--- a/lib/dynamic/configure
+++ b/lib/dynamic/configure
@@ -22,6 +22,9 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
+LIBS=""
+echo "LIBS = $LIBS" >> ${CONFIG_MK}
+
 LIBDIR=/usr/local/lib/rtbuf/$VER/dynamic
 echo "LIBDIR = $LIBDIR" >> ${CONFIG_MK}
 
@@ -36,7 +39,7 @@ for SRC in $SOURCES; do
     SRC_LA="$(c2la "$SRC")"
     echo >> ${CONFIG_MK}
     echo "$SRC_LA: $SRC_LO" >> ${CONFIG_MK}
-    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
+    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
     LIBRARIES="$LIBRARIES $SRC_LA"
 done
 
diff --git a/lib/glfw3/Makefile b/lib/glfw3/Makefile
index 7495f63..75a8bf5 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 7495f63..75a8bf5 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 7495f63..75a8bf5 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/reverb/configure b/lib/reverb/configure
index c9b888a..f3d63a2 100755
--- a/lib/reverb/configure
+++ b/lib/reverb/configure
@@ -22,6 +22,9 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
+LIBS=""
+echo "LIBS = $LIBS" >> ${CONFIG_MK}
+
 LIBDIR=/usr/local/lib/rtbuf/$VER/dynamic
 echo "LIBDIR = $LIBDIR" >> ${CONFIG_MK}
 
@@ -36,7 +39,7 @@ for SRC in $SOURCES; do
     SRC_LA="$(c2la "$SRC")"
     echo >> ${CONFIG_MK}
     echo "$SRC_LA: $SRC_LO" >> ${CONFIG_MK}
-    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
+    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
     LIBRARIES="$LIBRARIES $SRC_LA"
 done
 
diff --git a/lib/signal/Makefile b/lib/signal/Makefile
index 7495f63..75a8bf5 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/signal/configure b/lib/signal/configure
index c9b888a..f3d63a2 100755
--- a/lib/signal/configure
+++ b/lib/signal/configure
@@ -22,6 +22,9 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
+LIBS=""
+echo "LIBS = $LIBS" >> ${CONFIG_MK}
+
 LIBDIR=/usr/local/lib/rtbuf/$VER/dynamic
 echo "LIBDIR = $LIBDIR" >> ${CONFIG_MK}
 
@@ -36,7 +39,7 @@ for SRC in $SOURCES; do
     SRC_LA="$(c2la "$SRC")"
     echo >> ${CONFIG_MK}
     echo "$SRC_LA: $SRC_LO" >> ${CONFIG_MK}
-    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
+    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
     LIBRARIES="$LIBRARIES $SRC_LA"
 done
 
diff --git a/lib/sndio/Makefile b/lib/sndio/Makefile
index 7495f63..75a8bf5 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/sndio/configure b/lib/sndio/configure
index 75e71fb..aa7937d 100755
--- a/lib/sndio/configure
+++ b/lib/sndio/configure
@@ -19,9 +19,12 @@ fi
 CFLAGS="$CFLAGS -W -Wall -Werror -std=c89 -pedantic"
 echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 
-LDFLAGS="-lsndio"
+LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
+LIBS="-lsndio"
+echo "LIBS = $LIBS" >> ${CONFIG_MK}
+
 LIBDIR=/usr/local/lib/rtbuf/$VER/dynamic
 echo "LIBDIR = $LIBDIR" >> ${CONFIG_MK}
 
@@ -36,7 +39,7 @@ for SRC in $SOURCES; do
     SRC_LA="$(c2la "$SRC")"
     echo >> ${CONFIG_MK}
     echo "$SRC_LA: $SRC_LO" >> ${CONFIG_MK}
-    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
+    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
     LIBRARIES="$LIBRARIES $SRC_LA"
 done
 
diff --git a/lib/synth/Makefile b/lib/synth/Makefile
index 7495f63..75a8bf5 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/lib/synth/configure b/lib/synth/configure
index c9b888a..f3d63a2 100755
--- a/lib/synth/configure
+++ b/lib/synth/configure
@@ -22,6 +22,9 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
+LIBS=""
+echo "LIBS = $LIBS" >> ${CONFIG_MK}
+
 LIBDIR=/usr/local/lib/rtbuf/$VER/dynamic
 echo "LIBDIR = $LIBDIR" >> ${CONFIG_MK}
 
@@ -36,7 +39,7 @@ for SRC in $SOURCES; do
     SRC_LA="$(c2la "$SRC")"
     echo >> ${CONFIG_MK}
     echo "$SRC_LA: $SRC_LO" >> ${CONFIG_MK}
-    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
+    echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
     LIBRARIES="$LIBRARIES $SRC_LA"
 done
 
diff --git a/librtbuf/Makefile b/librtbuf/Makefile
index 263738a..835ec67 100644
--- a/librtbuf/Makefile
+++ b/librtbuf/Makefile
@@ -5,4 +5,4 @@ clean:
 
 .PHONY: all clean
 
-.include <config.mk>
+.include "config.mk"
diff --git a/librtbuf/configure b/librtbuf/configure
index 70df3c8..1b09987 100755
--- a/librtbuf/configure
+++ b/librtbuf/configure
@@ -28,6 +28,9 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
+LIBS=""
+echo "LIBS = $LIBS" >> ${CONFIG_MK}
+
 LIBDIR=/usr/local/lib
 echo "LIBDIR = $LIBDIR" >> ${CONFIG_MK}
 
@@ -40,4 +43,4 @@ done
 
 echo >> ${CONFIG_MK}
 echo "$LIB: $OBJECTS" >> ${CONFIG_MK}
-echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} \${LDFLAGS} $OBJECTS -o $LIB -rpath ${LIBDIR}" >> ${CONFIG_MK}
+echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} \${LDFLAGS} $OBJECTS \${LIBS} -o $LIB -rpath ${LIBDIR}" >> ${CONFIG_MK}