aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am5
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 46ef99e..337143e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,9 @@ AC_PROG_LIBTOOL
AC_ARG_WITH([pd], [ --with-pd=</path/to/pd> where to look for pd-headers and and -libs])
AC_ARG_WITH([extension],[ --with-extension=<ext> enforce a certain extension for the dynamic library (e.g. dll)])
-AC_ARG_ENABLE([library],[ --disable-library split the library into single externals])
+AC_ARG_ENABLE([library],[ --enable-library build zexy as multi-object library (default, "yes"), as single-object externals ("no") or as both ("both")])
AM_CONDITIONAL([LIBRARY], [test "x${enable_library}" != "xno"])
+AM_CONDITIONAL([SINGLEOBJECTS], [test "x${enable_library}" = "xno" || test "x${enable_library}" = "xboth"])
if test "x${libdir}" = "x\${exec_prefix}/lib"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 42613de..8ab1f84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,8 @@ AM_LDFLAGS+=
if LIBRARY
pkglib_LTLIBRARIES+=zexy.la
-else
+endif LIBRARY
+if SINGLEOBJECTS
pkglib_LTLIBRARIES+= \
0x260x260x7e.la \
0x2e.la \
@@ -115,7 +116,7 @@ pkglib_LTLIBRARIES+= \
urn.la \
wrap.la \
z~.la
-endif
+endif SINGLEOBJECTS
zexy_la_CPPFLAGS=-DZEXY_LIBRARY