Commit dba2f1a64ed157aa457acb74ee4f1f08e2c2a3c6
2020-01-20T20:19:42
fix build on OpenBSD
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/Makefile.am b/Makefile.am
index 84bb588..4dc6c98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,6 +81,7 @@ rtbuf_signal_type: rtbuf_signal_type.c rtbuf_signal.h
rtbuf_signal_type.h: rtbuf_signal_type
./rtbuf_signal_type > rtbuf_signal_type.h
CLEANFILES += rtbuf_signal_type rtbuf_signal_type.h
+rtbuf_signal.lo: rtbuf_signal_type.h
lib_LTLIBRARIES += librtbuf_signal.la
librtbuf_signal_la_LIBADD = ${SIGNAL_LIBS} librtbuf_music.la librtbuf.la
@@ -103,15 +104,18 @@ librtbuf_dynamic_la_SOURCES = \
include_HEADERS += \
rtbuf_dynamic.h
-rtbuf_synth_type: rtbuf_synth_type.c rtbuf_synth.h
+rtbuf_synth_type: rtbuf_synth_type.c rtbuf_synth.h rtbuf_music_type.h rtbuf_signal_type.h
${CC} ${CFLAGS} ${CPPFLAGS} -o rtbuf_synth_type rtbuf_synth_type.c
rtbuf_synth_type.h: rtbuf_synth_type
./rtbuf_synth_type > rtbuf_synth_type.h
CLEANFILES += rtbuf_synth_type rtbuf_synth_type.h
+rtbuf_synth.lo: rtbuf_synth_type.h
lib_LTLIBRARIES += librtbuf_synth.la
librtbuf_synth_la_LIBADD = librtbuf_signal.la librtbuf_music.la librtbuf.la
librtbuf_synth_la_SOURCES = \
+ rtbuf_music_type.h \
+ rtbuf_signal_type.h \
rtbuf_synth.c \
rtbuf_synth_adsr.c \
rtbuf_synth_synth.c
@@ -125,6 +129,7 @@ rtbuf_sndio_type: rtbuf_sndio_type.c rtbuf_sndio.h
rtbuf_sndio_type.h: rtbuf_sndio_type
./rtbuf_sndio_type > rtbuf_sndio_type.h
CLEANFILES += rtbuf_sndio_type rtbuf_sndio_type.h
+rtbuf_sndio.lo: rtbuf_sndio_type.h
lib_LTLIBRARIES += librtbuf_sndio.la
librtbuf_sndio_la_LIBADD = ${SNDIO_LIBS} librtbuf_signal.la librtbuf.la
@@ -144,6 +149,7 @@ rtbuf_portaudio_type: rtbuf_portaudio_type.c rtbuf_portaudio.h
rtbuf_portaudio_type.h: rtbuf_portaudio_type
./rtbuf_portaudio_type > rtbuf_portaudio_type.h
CLEANFILES += rtbuf_portaudio_type rtbuf_portaudio_type.h
+rtbuf_portaudio.lo: rtbuf_portaudio_type.h
lib_LTLIBRARIES += librtbuf_portaudio.la
librtbuf_portaudio_la_LIBADD = ${PORTAUDIO_LIBS} librtbuf_signal.la librtbuf.la
diff --git a/configure.ac b/configure.ac
index c0b2a9f..879f0ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,9 +29,10 @@ if test -d /usr/lib; then
LDFLAGS="$LDFLAGS -L/usr/lib"
fi
-AC_SEARCH_LIBS([strlcpy], [bsd],
- [LIBRTBUF_CFLAGS="-I/usr/include/bsd -DLIBBSD_OVERLAY"
- LIBRTBUF_LIBS="$LIBRTBUF_LIBS -lbsd"])
+AC_CHECK_FUNC([strlcpy], [echo using system strlcpy],
+ AC_SEARCH_LIBS([strlcpy], [bsd],
+ [LIBRTBUF_CFLAGS="-I/usr/include/bsd -DLIBBSD_OVERLAY"
+ LIBRTBUF_LIBS="$LIBRTBUF_LIBS -lbsd"]))
enable_libdata=true
AC_SEARCH_LIBS([libdata_init], [data],
@@ -69,8 +70,9 @@ AC_SEARCH_LIBS([pthread_create], [pthread],
AC_MSG_ERROR([missing libpthread for rtbuf])
fi])
-AC_SEARCH_LIBS([dlopen], [dl],
- [RTBUF_LIBS="$RTBUF_LIBS -ldl"])
+AC_CHECK_FUNC([dlopen], [echo using system dlopen],
+ AC_SEARCH_LIBS([dlopen], [dl],
+ [RTBUF_LIBS="$RTBUF_LIBS -ldl"]))
AC_CHECK_LIB([readline], [readline],
[RTBUF_LIBS="$RTBUF_LIBS -lreadline"],