diff --git a/moo/configure b/moo/configure index 097af93..0a3f114 100755 --- a/moo/configure +++ b/moo/configure @@ -656,6 +656,10 @@ MOO_SIZEOF_INT MOO_SIZEOF_LONG MOO_SIZEOF_LONG_LONG MOO_SIZEOF_WCHAR_T +ENABLE_MOD_X11_FALSE +ENABLE_MOD_X11_TRUE +ENABLE_MOD_FFI_FALSE +ENABLE_MOD_FFI_TRUE ENABLE_LIBLTDL_FALSE ENABLE_LIBLTDL_TRUE ENABLE_STATIC_MODULE_FALSE @@ -837,6 +841,8 @@ enable_cxx enable_dynamic_module enable_static_module enable_libltdl +enable_mod_ffi +enable_mod_x11 ' ac_precious_vars='build_alias host_alias @@ -1489,6 +1495,8 @@ Optional Features: --enable-static-module build modules statically into the main library(default. no) --enable-libltdl use libltdl(default. yes) + --enable-mod-ffi enable mod/ffi (default. yes) + --enable-mod-x11 enable mod/x11 (default. yes) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -18850,6 +18858,18 @@ fi done +for ac_header in xcb/xcb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "xcb/xcb.h" "ac_cv_header_xcb_xcb_h" "$ac_includes_default" +if test "x$ac_cv_header_xcb_xcb_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_XCB_XCB_H 1 +_ACEOF + +fi + +done + for ac_func in gettimeofday settimeofday clock_gettime clock_settime getitimer setitimer @@ -20665,6 +20685,52 @@ else fi +# Check whether --enable-mod-ffi was given. +if test "${enable_mod_ffi+set}" = set; then : + enableval=$enable_mod_ffi; enable_mod_ffi_is=$enableval +else + enable_mod_ffi_is=yes + +fi + +if test "${enable_mod_ffi_is}" = "yes" +then + +$as_echo "#define MOO_ENABLE_MOD_FFI /**/" >>confdefs.h + +fi + if test "${enable_mod_ffi_is}" = "yes"; then + ENABLE_MOD_FFI_TRUE= + ENABLE_MOD_FFI_FALSE='#' +else + ENABLE_MOD_FFI_TRUE='#' + ENABLE_MOD_FFI_FALSE= +fi + + +# Check whether --enable-mod-x11 was given. +if test "${enable_mod_x11+set}" = set; then : + enableval=$enable_mod_x11; enable_mod_x11_is=$enableval +else + enable_mod_x11_is=yes + +fi + +if test "${enable_mod_x11_is}" = "yes" +then + +$as_echo "#define MOO_ENABLE_MOD_X11 /**/" >>confdefs.h + +fi + if test "${enable_mod_x11_is}" = "yes"; then + ENABLE_MOD_X11_TRUE= + ENABLE_MOD_X11_FALSE='#' +else + ENABLE_MOD_X11_TRUE='#' + ENABLE_MOD_X11_FALSE= +fi + + MOO_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t MOO_SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long @@ -20884,6 +20950,14 @@ if test -z "${ENABLE_LIBLTDL_TRUE}" && test -z "${ENABLE_LIBLTDL_FALSE}"; then as_fn_error $? "conditional \"ENABLE_LIBLTDL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_MOD_FFI_TRUE}" && test -z "${ENABLE_MOD_FFI_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_MOD_FFI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ENABLE_MOD_X11_TRUE}" && test -z "${ENABLE_MOD_X11_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_MOD_X11\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/moo/configure.ac b/moo/configure.ac index 2322ffa..9295ed8 100644 --- a/moo/configure.ac +++ b/moo/configure.ac @@ -153,6 +153,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS([stddef.h wchar.h wctype.h errno.h signal.h fcntl.h dirent.h]) AC_CHECK_HEADERS([time.h sys/time.h utime.h spawn.h execinfo.h ucontext.h]) AC_CHECK_HEADERS([dyncall.h]) +AC_CHECK_HEADERS([xcb/xcb.h]) dnl check data types dnl AC_CHECK_TYPE([wchar_t], @@ -460,6 +461,30 @@ then fi AM_CONDITIONAL(ENABLE_LIBLTDL, test "${enable_libltdl_is}" = "yes") +dnl ===== enable-mod-ffi ===== +AC_ARG_ENABLE([mod-ffi], + [AS_HELP_STRING([--enable-mod-ffi],[enable mod/ffi (default. yes)])], + enable_mod_ffi_is=$enableval, + enable_mod_ffi_is=yes +) +if test "${enable_mod_ffi_is}" = "yes" +then + AC_DEFINE([MOO_ENABLE_MOD_FFI],[],[build mod/ffi]) +fi +AM_CONDITIONAL(ENABLE_MOD_FFI, test "${enable_mod_ffi_is}" = "yes") + +dnl ===== enable-mod-x11 ===== +AC_ARG_ENABLE([mod-x11], + [AS_HELP_STRING([--enable-mod-x11],[enable mod/x11 (default. yes)])], + enable_mod_x11_is=$enableval, + enable_mod_x11_is=yes +) +if test "${enable_mod_x11_is}" = "yes" +then + AC_DEFINE([MOO_ENABLE_MOD_X11],[],[build mod/x11]) +fi +AM_CONDITIONAL(ENABLE_MOD_X11, test "${enable_mod_x11_is}" = "yes") + AC_SUBST(MOO_SIZEOF_WCHAR_T, $ac_cv_sizeof_wchar_t) AC_SUBST(MOO_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long) AC_SUBST(MOO_SIZEOF_LONG, $ac_cv_sizeof_long) diff --git a/moo/kernel/Mill.moo b/moo/kernel/Mill.moo index 2924556..88e3b65 100644 --- a/moo/kernel/Mill.moo +++ b/moo/kernel/Mill.moo @@ -338,7 +338,8 @@ a := System _malloc(200). i := 0. while (i < 26) { - a putUint32(i, ($A asInteger + i)). + a putUint8(i, ($A asInteger + i)). + System _putUint8(a, i, ($A asInteger + i)). i := i + 1. }. while (i > 0) @@ -347,6 +348,7 @@ while (i > 0) a getUint8(i) asCharacter dump. }. a getUint32(0) dump. +a getUint32(1) dump. ##a dump. ##System _free(a). diff --git a/moo/lib/Makefile.am b/moo/lib/Makefile.am index d82d640..b019f54 100644 --- a/moo/lib/Makefile.am +++ b/moo/lib/Makefile.am @@ -68,12 +68,20 @@ libmoo_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) libmoo_la_LIBADD = $(LIBADD_LIB_COMMON) if ENABLE_STATIC_MODULE -libmoo_la_LIBADD += -lmoo-ffi -lmoo-console -lmoo-stdio -lmoo-x11 +libmoo_la_LIBADD += -lmoo-console -lmoo-stdio libmoo_la_DEPENDENCIES = \ - $(abs_builddir)/../mod/libmoo-ffi.la \ $(abs_builddir)/../mod/libmoo-console.la \ - $(abs_builddir)/../mod/libmoo-stdio.la \ - $(abs_builddir)/../mod/libmoo-x11.la + $(abs_builddir)/../mod/libmoo-stdio.la + +if ENABLE_MOD_FFI +libmoo_la_LIBADD += -lmoo-ffi +libmoo_la_DEPENDENCIES += $(abs_builddir)/../mod/libmoo-ffi.la +endif +if ENABLE_MOD_X11 +libmoo_la_LIBADD += -lmoo-x11 +libmoo_la_DEPENDENCIES += $(abs_builddir)/../mod/libmoo-x11.la +endif + endif bin_PROGRAMS = moo diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in index 89353b4..0405223 100644 --- a/moo/lib/Makefile.in +++ b/moo/lib/Makefile.in @@ -95,10 +95,16 @@ host_triplet = @host@ # to the first number in -version-info above @WIN32_TRUE@am__append_3 = -DMOO_DEFAULT_MODPREFIX=\"libmoo-\" -DMOO_DEFAULT_MODPOSTFIX=\"-1\" @WIN32_FALSE@am__append_4 = -DMOO_DEFAULT_MODPREFIX=\"$(libdir)/libmoo-\" -DMOO_DEFAULT_MODPOSTFIX=\"\" -@ENABLE_STATIC_MODULE_TRUE@am__append_5 = -lmoo-ffi -lmoo-console -lmoo-stdio -lmoo-x11 +@ENABLE_STATIC_MODULE_TRUE@am__append_5 = -lmoo-console -lmoo-stdio @ENABLE_STATIC_MODULE_FALSE@libmoo_la_DEPENDENCIES = \ @ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_3) \ +@ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_1) \ +@ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_1) \ @ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_1) +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_6 = -lmoo-ffi +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_7 = $(abs_builddir)/../mod/libmoo-ffi.la +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_8 = -lmoo-x11 +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_9 = $(abs_builddir)/../mod/libmoo-x11.la bin_PROGRAMS = moo$(EXEEXT) subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -444,13 +450,11 @@ libmoo_la_SOURCES = \ libmoo_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) libmoo_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) -libmoo_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_5) -@ENABLE_STATIC_MODULE_TRUE@libmoo_la_DEPENDENCIES = \ -@ENABLE_STATIC_MODULE_TRUE@ $(abs_builddir)/../mod/libmoo-ffi.la \ -@ENABLE_STATIC_MODULE_TRUE@ $(abs_builddir)/../mod/libmoo-console.la \ +libmoo_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_5) \ + $(am__append_6) $(am__append_8) +@ENABLE_STATIC_MODULE_TRUE@libmoo_la_DEPENDENCIES = $(abs_builddir)/../mod/libmoo-console.la \ @ENABLE_STATIC_MODULE_TRUE@ $(abs_builddir)/../mod/libmoo-stdio.la \ -@ENABLE_STATIC_MODULE_TRUE@ $(abs_builddir)/../mod/libmoo-x11.la - +@ENABLE_STATIC_MODULE_TRUE@ $(am__append_7) $(am__append_9) moo_SOURCES = main.c moo_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) moo_LDFLAGS = $(LDFLAGS_LIB_COMMON) diff --git a/moo/lib/exec.c b/moo/lib/exec.c index 89333a9..83538d1 100644 --- a/moo/lib/exec.c +++ b/moo/lib/exec.c @@ -3111,7 +3111,6 @@ static MOO_INLINE int _store_raw_int (moo_t* moo, moo_uint8_t* rawptr, moo_oow_t /* assume 2's complement */ max = (moo_ooi_t)(~(moo_oow_t)0 >> ((MOO_SIZEOF_OOW_T - size) * 8 + 1)); min = -max - 1; -MOO_DEBUG2 (moo, "MAX = %zd MIN = %zd\n", max, min); if (w > max || w < min) { @@ -3156,21 +3155,19 @@ static MOO_INLINE int _store_raw_uint (moo_t* moo, moo_uint8_t* rawptr, moo_oow_ moo_oow_t w, max; - if ((n = moo_inttooow (moo, voop, &w)) <= -1) + if ((n = moo_inttooow (moo, voop, &w)) <= 0) { - if (n <= -1) moo->errnum = MOO_ERANGE; + if (n <= -1) moo->errnum = MOO_ERANGE; /* negative number */ return -1; } max = (~(moo_oow_t)0 >> ((MOO_SIZEOF_OOW_T - size) * 8)); -MOO_DEBUG2 (moo, "MAX = %zx %zx\n", max, max); if (w > max) { moo->errnum = MOO_ERANGE; return -1; } - switch (size) { case 1: diff --git a/moo/lib/moo-cfg.h.in b/moo/lib/moo-cfg.h.in index 6c075e3..e009376 100644 --- a/moo/lib/moo-cfg.h.in +++ b/moo/lib/moo-cfg.h.in @@ -277,6 +277,9 @@ /* This value is set to 1 to indicate that the system argz facility works */ #undef HAVE_WORKING_ARGZ +/* Define to 1 if you have the header file. */ +#undef HAVE_XCB_XCB_H + /* Define to 1 if you have the `_vsnprintf' function. */ #undef HAVE__VSNPRINTF @@ -332,6 +335,12 @@ /* use libltdl when loading a dynamic module */ #undef MOO_ENABLE_LIBLTDL +/* build mod/ffi */ +#undef MOO_ENABLE_MOD_FFI + +/* build mod/x11 */ +#undef MOO_ENABLE_MOD_X11 + /* link modules statically into the main library */ #undef MOO_ENABLE_STATIC_MODULE diff --git a/moo/lib/moo.c b/moo/lib/moo.c index f84fe36..9bc5797 100644 --- a/moo/lib/moo.c +++ b/moo/lib/moo.c @@ -372,10 +372,14 @@ static struct static_modtab[] = { { "console", moo_mod_console }, +#if defined(MOO_ENABLE_MOD_FFI) { "ffi", moo_mod_ffi }, +#endif { "stdio", moo_mod_stdio }, +#if defined(MOO_ENABLE_MOD_X11) { "x11", moo_mod_x11 }, - { "x11.win", moo_mod_x11_win } + { "x11.win", moo_mod_x11_win }, +#endif }; #endif diff --git a/moo/mod/Makefile.am b/moo/mod/Makefile.am index 36f8356..e03d8d0 100644 --- a/moo/mod/Makefile.am +++ b/moo/mod/Makefile.am @@ -23,7 +23,14 @@ if ENABLE_STATIC_MODULE LDFLAGS_COMMON =-L$(libdir) -version-info 1:0:0 -no-undefined LIBADD_COMMON = -noinst_LTLIBRARIES = libmoo-console.la libmoo-ffi.la libmoo-stdio.la libmoo-x11.la +noinst_LTLIBRARIES = libmoo-console.la libmoo-stdio.la + +if ENABLE_MOD_FFI +noinst_LTLIBRARIES += libmoo-ffi.la +endif +if ENABLE_MOD_X11 +noinst_LTLIBRARIES += libmoo-x11.la +endif else @@ -34,7 +41,14 @@ LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) -version-info 1:0:0 -no-un LIBADD_COMMON = -lmoo pkgmodexecdir = $(libdir) -pkgmodexec_LTLIBRARIES = libmoo-console.la libmoo-ffi.la libmoo-stdio.la libmoo-x11.la +pkgmodexec_LTLIBRARIES = libmoo-console.la libmoo-stdio.la + +if ENABLE_MOD_FFI +pkgmodexec_LTLIBRARIES += libmoo-ffi.la +endif +if ENABLE_MOD_X11 +pkgmodexec_LTLIBRARIES += libmoo-x11.la +endif endif @@ -43,17 +57,21 @@ libmoo_console_la_CPPFLAGS = $(CPPFLAGS_COMMON) libmoo_console_la_LDFLAGS = $(LDFLAGS_COMMON) libmoo_console_la_LIBADD = $(LIBADD_COMMON) -ltermcap +if ENABLE_MOD_FFI libmoo_ffi_la_SOURCES = ffi.c _ffi.h libmoo_ffi_la_CPPFLAGS = $(CPPFLAGS_COMMON) libmoo_ffi_la_LDFLAGS = $(LDFLAGS_COMMON) libmoo_ffi_la_LIBADD = $(LIBADD_COMMON) $(DYNCALL_LIBS) +endif libmoo_stdio_la_SOURCES = stdio.c _stdio.h libmoo_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON) libmoo_stdio_la_LDFLAGS = $(LDFLAGS_COMMON) libmoo_stdio_la_LIBADD = $(LIBADD_COMMON) +if ENABLE_MOD_X11 libmoo_x11_la_SOURCES = x11.c _x11.h libmoo_x11_la_CPPFLAGS = $(CPPFLAGS_COMMON) libmoo_x11_la_LDFLAGS = $(LDFLAGS_COMMON) libmoo_x11_la_LIBADD = $(LIBADD_COMMON) -lxcb +endif diff --git a/moo/mod/Makefile.in b/moo/mod/Makefile.in index 4a90f41..1b74286 100644 --- a/moo/mod/Makefile.in +++ b/moo/mod/Makefile.in @@ -93,6 +93,10 @@ host_triplet = @host@ # to the first number in -version-info above @WIN32_TRUE@am__append_1 = -DMOO_DEFAULT_PFMODPREFIX=\"libmoo-\" -DMOO_DEFAULT_PFMODPOSTFIX=\"-1\" @WIN32_FALSE@am__append_2 = -DMOO_DEFAULT_PFMODPREFIX=\"$(libdir)/libmoo-\" -DMOO_DEFAULT_PFMODPOSTFIX=\"\" +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_3 = libmoo-ffi.la +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_4 = libmoo-x11.la +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_5 = libmoo-ffi.la +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_6 = libmoo-x11.la subdir = mod ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_namespace.m4 \ @@ -152,16 +156,19 @@ libmoo_console_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @ENABLE_STATIC_MODULE_FALSE@am_libmoo_console_la_rpath = -rpath \ @ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir) @ENABLE_STATIC_MODULE_TRUE@am_libmoo_console_la_rpath = -libmoo_ffi_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libmoo_ffi_la_OBJECTS = libmoo_ffi_la-ffi.lo +@ENABLE_MOD_FFI_TRUE@libmoo_ffi_la_DEPENDENCIES = \ +@ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) \ +@ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) +am__libmoo_ffi_la_SOURCES_DIST = ffi.c _ffi.h +@ENABLE_MOD_FFI_TRUE@am_libmoo_ffi_la_OBJECTS = libmoo_ffi_la-ffi.lo libmoo_ffi_la_OBJECTS = $(am_libmoo_ffi_la_OBJECTS) libmoo_ffi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libmoo_ffi_la_LDFLAGS) $(LDFLAGS) -o $@ -@ENABLE_STATIC_MODULE_FALSE@am_libmoo_ffi_la_rpath = -rpath \ -@ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir) -@ENABLE_STATIC_MODULE_TRUE@am_libmoo_ffi_la_rpath = +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am_libmoo_ffi_la_rpath = \ +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@ -rpath \ +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir) +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am_libmoo_ffi_la_rpath = libmoo_stdio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libmoo_stdio_la_OBJECTS = libmoo_stdio_la-stdio.lo libmoo_stdio_la_OBJECTS = $(am_libmoo_stdio_la_OBJECTS) @@ -172,15 +179,18 @@ libmoo_stdio_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @ENABLE_STATIC_MODULE_FALSE@am_libmoo_stdio_la_rpath = -rpath \ @ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir) @ENABLE_STATIC_MODULE_TRUE@am_libmoo_stdio_la_rpath = -libmoo_x11_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libmoo_x11_la_OBJECTS = libmoo_x11_la-x11.lo +@ENABLE_MOD_X11_TRUE@libmoo_x11_la_DEPENDENCIES = \ +@ENABLE_MOD_X11_TRUE@ $(am__DEPENDENCIES_1) +am__libmoo_x11_la_SOURCES_DIST = x11.c _x11.h +@ENABLE_MOD_X11_TRUE@am_libmoo_x11_la_OBJECTS = libmoo_x11_la-x11.lo libmoo_x11_la_OBJECTS = $(am_libmoo_x11_la_OBJECTS) libmoo_x11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libmoo_x11_la_LDFLAGS) $(LDFLAGS) -o $@ -@ENABLE_STATIC_MODULE_FALSE@am_libmoo_x11_la_rpath = -rpath \ -@ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir) -@ENABLE_STATIC_MODULE_TRUE@am_libmoo_x11_la_rpath = +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_FALSE@am_libmoo_x11_la_rpath = \ +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_FALSE@ -rpath \ +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir) +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am_libmoo_x11_la_rpath = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -217,8 +227,9 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libmoo_console_la_SOURCES) $(libmoo_ffi_la_SOURCES) \ $(libmoo_stdio_la_SOURCES) $(libmoo_x11_la_SOURCES) -DIST_SOURCES = $(libmoo_console_la_SOURCES) $(libmoo_ffi_la_SOURCES) \ - $(libmoo_stdio_la_SOURCES) $(libmoo_x11_la_SOURCES) +DIST_SOURCES = $(libmoo_console_la_SOURCES) \ + $(am__libmoo_ffi_la_SOURCES_DIST) $(libmoo_stdio_la_SOURCES) \ + $(am__libmoo_x11_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -422,25 +433,29 @@ CPPFLAGS_COMMON = -I$(abs_builddir) -I$(abs_builddir)/../lib \ @ENABLE_STATIC_MODULE_TRUE@LDFLAGS_COMMON = -L$(libdir) -version-info 1:0:0 -no-undefined @ENABLE_STATIC_MODULE_FALSE@LIBADD_COMMON = -lmoo @ENABLE_STATIC_MODULE_TRUE@LIBADD_COMMON = -@ENABLE_STATIC_MODULE_TRUE@noinst_LTLIBRARIES = libmoo-console.la libmoo-ffi.la libmoo-stdio.la libmoo-x11.la +@ENABLE_STATIC_MODULE_TRUE@noinst_LTLIBRARIES = libmoo-console.la \ +@ENABLE_STATIC_MODULE_TRUE@ libmoo-stdio.la $(am__append_3) \ +@ENABLE_STATIC_MODULE_TRUE@ $(am__append_4) @ENABLE_STATIC_MODULE_FALSE@pkgmodexecdir = $(libdir) -@ENABLE_STATIC_MODULE_FALSE@pkgmodexec_LTLIBRARIES = libmoo-console.la libmoo-ffi.la libmoo-stdio.la libmoo-x11.la +@ENABLE_STATIC_MODULE_FALSE@pkgmodexec_LTLIBRARIES = \ +@ENABLE_STATIC_MODULE_FALSE@ libmoo-console.la libmoo-stdio.la \ +@ENABLE_STATIC_MODULE_FALSE@ $(am__append_5) $(am__append_6) libmoo_console_la_SOURCES = console.c console.h libmoo_console_la_CPPFLAGS = $(CPPFLAGS_COMMON) libmoo_console_la_LDFLAGS = $(LDFLAGS_COMMON) libmoo_console_la_LIBADD = $(LIBADD_COMMON) -ltermcap -libmoo_ffi_la_SOURCES = ffi.c _ffi.h -libmoo_ffi_la_CPPFLAGS = $(CPPFLAGS_COMMON) -libmoo_ffi_la_LDFLAGS = $(LDFLAGS_COMMON) -libmoo_ffi_la_LIBADD = $(LIBADD_COMMON) $(DYNCALL_LIBS) +@ENABLE_MOD_FFI_TRUE@libmoo_ffi_la_SOURCES = ffi.c _ffi.h +@ENABLE_MOD_FFI_TRUE@libmoo_ffi_la_CPPFLAGS = $(CPPFLAGS_COMMON) +@ENABLE_MOD_FFI_TRUE@libmoo_ffi_la_LDFLAGS = $(LDFLAGS_COMMON) +@ENABLE_MOD_FFI_TRUE@libmoo_ffi_la_LIBADD = $(LIBADD_COMMON) $(DYNCALL_LIBS) libmoo_stdio_la_SOURCES = stdio.c _stdio.h libmoo_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON) libmoo_stdio_la_LDFLAGS = $(LDFLAGS_COMMON) libmoo_stdio_la_LIBADD = $(LIBADD_COMMON) -libmoo_x11_la_SOURCES = x11.c _x11.h -libmoo_x11_la_CPPFLAGS = $(CPPFLAGS_COMMON) -libmoo_x11_la_LDFLAGS = $(LDFLAGS_COMMON) -libmoo_x11_la_LIBADD = $(LIBADD_COMMON) -lxcb +@ENABLE_MOD_X11_TRUE@libmoo_x11_la_SOURCES = x11.c _x11.h +@ENABLE_MOD_X11_TRUE@libmoo_x11_la_CPPFLAGS = $(CPPFLAGS_COMMON) +@ENABLE_MOD_X11_TRUE@libmoo_x11_la_LDFLAGS = $(LDFLAGS_COMMON) +@ENABLE_MOD_X11_TRUE@libmoo_x11_la_LIBADD = $(LIBADD_COMMON) -lxcb all: all-am .SUFFIXES: