From 92a21f04b8de201c1bbcac9ff6561fa0a41b0f2b Mon Sep 17 00:00:00 2001 From: "hyunghwan.chung" Date: Wed, 13 Dec 2017 10:57:31 +0000 Subject: [PATCH] renamed mod_console to mod_con. added --enable-mod-con in configure.ac --- moo/configure | 31 +++++++++++++++ moo/configure.ac | 12 ++++++ moo/lib/Makefile.am | 10 +++-- moo/lib/Makefile.in | 25 +++++++----- moo/lib/moo-cfg.h.in | 3 ++ moo/lib/moo.c | 8 +++- moo/mod/Makefile.am | 16 +++++--- moo/mod/Makefile.in | 75 ++++++++++++++++++----------------- moo/mod/{console.h => _con.h} | 6 +-- 9 files changed, 123 insertions(+), 63 deletions(-) rename moo/mod/{console.h => _con.h} (92%) diff --git a/moo/configure b/moo/configure index f0358a8..5cb9d44 100755 --- a/moo/configure +++ b/moo/configure @@ -662,6 +662,8 @@ ENABLE_MOD_SCK_FALSE ENABLE_MOD_SCK_TRUE ENABLE_MOD_FFI_FALSE ENABLE_MOD_FFI_TRUE +ENABLE_MOD_CON_FALSE +ENABLE_MOD_CON_TRUE ENABLE_LIBLTDL_FALSE ENABLE_LIBLTDL_TRUE ENABLE_STATIC_MODULE_FALSE @@ -842,6 +844,7 @@ enable_cxx enable_dynamic_module enable_static_module enable_libltdl +enable_mod_con enable_mod_ffi enable_mod_sck enable_mod_x11 @@ -1496,6 +1499,7 @@ Optional Features: --enable-static-module build modules statically into the main library(default. no) --enable-libltdl use libltdl(default. yes) + --enable-mod-con enable mod/con (default. yes) --enable-mod-ffi enable mod/ffi (default. yes) --enable-mod-sck enable mod/sck (default. yes) --enable-mod-x11 enable mod/x11 (default. yes) @@ -20221,6 +20225,29 @@ else fi +# Check whether --enable-mod-con was given. +if test "${enable_mod_con+set}" = set; then : + enableval=$enable_mod_con; enable_mod_con_is=$enableval +else + enable_mod_con_is=yes + +fi + +if test "${enable_mod_con_is}" = "yes" +then + +$as_echo "#define MOO_ENABLE_MOD_CON /**/" >>confdefs.h + +fi + if test "${enable_mod_con_is}" = "yes"; then + ENABLE_MOD_CON_TRUE= + ENABLE_MOD_CON_FALSE='#' +else + ENABLE_MOD_CON_TRUE='#' + ENABLE_MOD_CON_FALSE= +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 @@ -20509,6 +20536,10 @@ 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_CON_TRUE}" && test -z "${ENABLE_MOD_CON_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_MOD_CON\" 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 diff --git a/moo/configure.ac b/moo/configure.ac index 02567ca..d547d06 100644 --- a/moo/configure.ac +++ b/moo/configure.ac @@ -497,6 +497,18 @@ then fi AM_CONDITIONAL(ENABLE_LIBLTDL, test "${enable_libltdl_is}" = "yes") +dnl ===== enable-mod-con ===== +AC_ARG_ENABLE([mod-con], + [AS_HELP_STRING([--enable-mod-con],[enable mod/con (default. yes)])], + enable_mod_con_is=$enableval, + enable_mod_con_is=yes +) +if test "${enable_mod_con_is}" = "yes" +then + AC_DEFINE([MOO_ENABLE_MOD_CON],[],[build mod/con]) +fi +AM_CONDITIONAL(ENABLE_MOD_CON, test "${enable_mod_con_is}" = "yes") + dnl ===== enable-mod-ffi ===== AC_ARG_ENABLE([mod-ffi], [AS_HELP_STRING([--enable-mod-ffi],[enable mod/ffi (default. yes)])], diff --git a/moo/lib/Makefile.am b/moo/lib/Makefile.am index 451c92c..dc9f30e 100644 --- a/moo/lib/Makefile.am +++ b/moo/lib/Makefile.am @@ -72,11 +72,13 @@ libmoo_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) libmoo_la_LIBADD = $(LIBADD_LIB_COMMON) if ENABLE_STATIC_MODULE -libmoo_la_LIBADD += -lmoo-console -lmoo-stdio -libmoo_la_DEPENDENCIES = \ - $(abs_builddir)/../mod/libmoo-console.la \ - $(abs_builddir)/../mod/libmoo-stdio.la +libmoo_la_LIBADD += -lmoo-stdio +libmoo_la_DEPENDENCIES = $(abs_builddir)/../mod/libmoo-stdio.la +if ENABLE_MOD_CON +libmoo_la_LIBADD += -lmoo-con +libmoo_la_DEPENDENCIES += $(abs_builddir)/../mod/libmoo-con.la +endif if ENABLE_MOD_FFI libmoo_la_LIBADD += -lmoo-ffi libmoo_la_DEPENDENCIES += $(abs_builddir)/../mod/libmoo-ffi.la diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in index bb26fde..e23282a 100644 --- a/moo/lib/Makefile.in +++ b/moo/lib/Makefile.in @@ -85,19 +85,22 @@ 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-console -lmoo-stdio +@ENABLE_STATIC_MODULE_TRUE@am__append_5 = -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_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_SCK_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_8 = -lmoo-sck -@ENABLE_MOD_SCK_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_9 = $(abs_builddir)/../mod/libmoo-sck.la -@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_10 = -lmoo-x11 -@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_11 = $(abs_builddir)/../mod/libmoo-x11.la +@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_6 = -lmoo-con +@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_7 = $(abs_builddir)/../mod/libmoo-con.la +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_8 = -lmoo-ffi +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_9 = $(abs_builddir)/../mod/libmoo-ffi.la +@ENABLE_MOD_SCK_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_10 = -lmoo-sck +@ENABLE_MOD_SCK_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_11 = $(abs_builddir)/../mod/libmoo-sck.la +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_12 = -lmoo-x11 +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_13 = $(abs_builddir)/../mod/libmoo-x11.la bin_PROGRAMS = moo$(EXEEXT) @ENABLE_STATIC_MODULE_FALSE@moo_DEPENDENCIES = $(am__DEPENDENCIES_3) subdir = lib @@ -448,11 +451,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) \ - $(am__append_6) $(am__append_8) $(am__append_10) -@ENABLE_STATIC_MODULE_TRUE@libmoo_la_DEPENDENCIES = $(abs_builddir)/../mod/libmoo-console.la \ -@ENABLE_STATIC_MODULE_TRUE@ $(abs_builddir)/../mod/libmoo-stdio.la \ + $(am__append_6) $(am__append_8) $(am__append_10) \ + $(am__append_12) +@ENABLE_STATIC_MODULE_TRUE@libmoo_la_DEPENDENCIES = $(abs_builddir)/../mod/libmoo-stdio.la \ @ENABLE_STATIC_MODULE_TRUE@ $(am__append_7) $(am__append_9) \ -@ENABLE_STATIC_MODULE_TRUE@ $(am__append_11) +@ENABLE_STATIC_MODULE_TRUE@ $(am__append_11) $(am__append_13) moo_SOURCES = main.c moo_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) moo_LDFLAGS = $(LDFLAGS_LIB_COMMON) diff --git a/moo/lib/moo-cfg.h.in b/moo/lib/moo-cfg.h.in index 2230cbe..916e9db 100644 --- a/moo/lib/moo-cfg.h.in +++ b/moo/lib/moo-cfg.h.in @@ -345,6 +345,9 @@ /* use libltdl when loading a dynamic module */ #undef MOO_ENABLE_LIBLTDL +/* build mod/con */ +#undef MOO_ENABLE_MOD_CON + /* build mod/ffi */ #undef MOO_ENABLE_MOD_FFI diff --git a/moo/lib/moo.c b/moo/lib/moo.c index a4963e3..5485855 100644 --- a/moo/lib/moo.c +++ b/moo/lib/moo.c @@ -395,7 +395,9 @@ void moo_freemem (moo_t* moo, void* ptr) #if defined(MOO_ENABLE_STATIC_MODULE) -#include "../mod/console.h" +#if defined(MOO_ENABLE_MOD_CON) +# include "../mod/_con.h" +#endif #if defined(MOO_ENABLE_MOD_FFI) # include "../mod/_ffi.h" #endif @@ -414,7 +416,9 @@ static struct } static_modtab[] = { - { "console", moo_mod_console }, +#if defined(MOO_ENABLE_MOD_CON) + { "con", moo_mod_con }, +#endif #if defined(MOO_ENABLE_MOD_FFI) { "ffi", moo_mod_ffi }, #endif diff --git a/moo/mod/Makefile.am b/moo/mod/Makefile.am index 6b57991..8382a0e 100644 --- a/moo/mod/Makefile.am +++ b/moo/mod/Makefile.am @@ -25,7 +25,9 @@ LIBADD_COMMON = noinst_LTLIBRARIES = -noinst_LTLIBRARIES += libmoo-console.la +if ENABLE_MOD_CON +noinst_LTLIBRARIES += libmoo-con.la +endif if ENABLE_MOD_FFI noinst_LTLIBRARIES += libmoo-ffi.la @@ -52,7 +54,9 @@ LIBADD_COMMON = -lmoo pkgmodexecdir = $(libdir) pkgmodexec_LTLIBRARIES = -pkgmodexec_LTLIBRARIES += libmoo-console.la +if ENABLE_MOD_CON +pkgmodexec_LTLIBRARIES += libmoo-con.la +endif if ENABLE_MOD_FFI pkgmodexec_LTLIBRARIES += libmoo-ffi.la @@ -70,10 +74,10 @@ endif endif -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) $(TERMINAL_LIBS) +libmoo_con_la_SOURCES = con.c _con.h +libmoo_con_la_CPPFLAGS = $(CPPFLAGS_COMMON) +libmoo_con_la_LDFLAGS = $(LDFLAGS_COMMON) +libmoo_con_la_LIBADD = $(LIBADD_COMMON) $(TERMINAL_LIBS) if ENABLE_MOD_FFI libmoo_ffi_la_SOURCES = ffi.c _ffi.h diff --git a/moo/mod/Makefile.in b/moo/mod/Makefile.in index 9a0b7ef..5e5582c 100644 --- a/moo/mod/Makefile.in +++ b/moo/mod/Makefile.in @@ -83,12 +83,14 @@ 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_SCK_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_4 = libmoo-sck.la -@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_5 = libmoo-x11.la -@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_6 = libmoo-ffi.la -@ENABLE_MOD_SCK_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_7 = libmoo-sck.la -@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_8 = libmoo-x11.la +@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_3 = libmoo-con.la +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_4 = libmoo-ffi.la +@ENABLE_MOD_SCK_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_5 = libmoo-sck.la +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_6 = libmoo-x11.la +@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_7 = libmoo-con.la +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_8 = libmoo-ffi.la +@ENABLE_MOD_SCK_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_9 = libmoo-sck.la +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_10 = libmoo-x11.la subdir = mod DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/ac/depcomp @@ -135,21 +137,21 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(pkgmodexecdir)" LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkgmodexec_LTLIBRARIES) am__DEPENDENCIES_1 = -libmoo_console_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +libmoo_con_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_libmoo_console_la_OBJECTS = libmoo_console_la-console.lo -libmoo_console_la_OBJECTS = $(am_libmoo_console_la_OBJECTS) +am_libmoo_con_la_OBJECTS = libmoo_con_la-con.lo +libmoo_con_la_OBJECTS = $(am_libmoo_con_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -libmoo_console_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libmoo_console_la_LDFLAGS) $(LDFLAGS) \ - -o $@ -@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_con_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libmoo_con_la_LDFLAGS) $(LDFLAGS) -o $@ +@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_FALSE@am_libmoo_con_la_rpath = \ +@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_FALSE@ -rpath \ +@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir) +@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_TRUE@am_libmoo_con_la_rpath = @ENABLE_MOD_FFI_TRUE@libmoo_ffi_la_DEPENDENCIES = \ @ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) \ @ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) @@ -231,10 +233,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libmoo_console_la_SOURCES) $(libmoo_ffi_la_SOURCES) \ +SOURCES = $(libmoo_con_la_SOURCES) $(libmoo_ffi_la_SOURCES) \ $(libmoo_sck_la_SOURCES) $(libmoo_stdio_la_SOURCES) \ $(libmoo_x11_la_SOURCES) -DIST_SOURCES = $(libmoo_console_la_SOURCES) \ +DIST_SOURCES = $(libmoo_con_la_SOURCES) \ $(am__libmoo_ffi_la_SOURCES_DIST) \ $(am__libmoo_sck_la_SOURCES_DIST) $(libmoo_stdio_la_SOURCES) \ $(am__libmoo_x11_la_SOURCES_DIST) @@ -440,18 +442,17 @@ 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 \ -@ENABLE_STATIC_MODULE_TRUE@ $(am__append_3) $(am__append_4) \ -@ENABLE_STATIC_MODULE_TRUE@ libmoo-stdio.la $(am__append_5) +@ENABLE_STATIC_MODULE_TRUE@noinst_LTLIBRARIES = $(am__append_3) \ +@ENABLE_STATIC_MODULE_TRUE@ $(am__append_4) $(am__append_5) \ +@ENABLE_STATIC_MODULE_TRUE@ libmoo-stdio.la $(am__append_6) @ENABLE_STATIC_MODULE_FALSE@pkgmodexecdir = $(libdir) -@ENABLE_STATIC_MODULE_FALSE@pkgmodexec_LTLIBRARIES = \ -@ENABLE_STATIC_MODULE_FALSE@ libmoo-console.la $(am__append_6) \ -@ENABLE_STATIC_MODULE_FALSE@ $(am__append_7) libmoo-stdio.la \ -@ENABLE_STATIC_MODULE_FALSE@ $(am__append_8) -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) $(TERMINAL_LIBS) +@ENABLE_STATIC_MODULE_FALSE@pkgmodexec_LTLIBRARIES = $(am__append_7) \ +@ENABLE_STATIC_MODULE_FALSE@ $(am__append_8) $(am__append_9) \ +@ENABLE_STATIC_MODULE_FALSE@ libmoo-stdio.la $(am__append_10) +libmoo_con_la_SOURCES = con.c _con.h +libmoo_con_la_CPPFLAGS = $(CPPFLAGS_COMMON) +libmoo_con_la_LDFLAGS = $(LDFLAGS_COMMON) +libmoo_con_la_LIBADD = $(LIBADD_COMMON) $(TERMINAL_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) @@ -549,8 +550,8 @@ clean-pkgmodexecLTLIBRARIES: rm -f $${locs}; \ } -libmoo-console.la: $(libmoo_console_la_OBJECTS) $(libmoo_console_la_DEPENDENCIES) $(EXTRA_libmoo_console_la_DEPENDENCIES) - $(AM_V_CCLD)$(libmoo_console_la_LINK) $(am_libmoo_console_la_rpath) $(libmoo_console_la_OBJECTS) $(libmoo_console_la_LIBADD) $(LIBS) +libmoo-con.la: $(libmoo_con_la_OBJECTS) $(libmoo_con_la_DEPENDENCIES) $(EXTRA_libmoo_con_la_DEPENDENCIES) + $(AM_V_CCLD)$(libmoo_con_la_LINK) $(am_libmoo_con_la_rpath) $(libmoo_con_la_OBJECTS) $(libmoo_con_la_LIBADD) $(LIBS) libmoo-ffi.la: $(libmoo_ffi_la_OBJECTS) $(libmoo_ffi_la_DEPENDENCIES) $(EXTRA_libmoo_ffi_la_DEPENDENCIES) $(AM_V_CCLD)$(libmoo_ffi_la_LINK) $(am_libmoo_ffi_la_rpath) $(libmoo_ffi_la_OBJECTS) $(libmoo_ffi_la_LIBADD) $(LIBS) @@ -570,7 +571,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmoo_console_la-console.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmoo_con_la-con.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmoo_ffi_la-ffi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmoo_sck_la-sck.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmoo_stdio_la-stdio.Plo@am__quote@ @@ -600,12 +601,12 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libmoo_console_la-console.lo: console.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmoo_console_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmoo_console_la-console.lo -MD -MP -MF $(DEPDIR)/libmoo_console_la-console.Tpo -c -o libmoo_console_la-console.lo `test -f 'console.c' || echo '$(srcdir)/'`console.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmoo_console_la-console.Tpo $(DEPDIR)/libmoo_console_la-console.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='console.c' object='libmoo_console_la-console.lo' libtool=yes @AMDEPBACKSLASH@ +libmoo_con_la-con.lo: con.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmoo_con_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmoo_con_la-con.lo -MD -MP -MF $(DEPDIR)/libmoo_con_la-con.Tpo -c -o libmoo_con_la-con.lo `test -f 'con.c' || echo '$(srcdir)/'`con.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmoo_con_la-con.Tpo $(DEPDIR)/libmoo_con_la-con.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='con.c' object='libmoo_con_la-con.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmoo_console_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmoo_console_la-console.lo `test -f 'console.c' || echo '$(srcdir)/'`console.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmoo_con_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmoo_con_la-con.lo `test -f 'con.c' || echo '$(srcdir)/'`con.c libmoo_ffi_la-ffi.lo: ffi.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmoo_ffi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmoo_ffi_la-ffi.lo -MD -MP -MF $(DEPDIR)/libmoo_ffi_la-ffi.Tpo -c -o libmoo_ffi_la-ffi.lo `test -f 'ffi.c' || echo '$(srcdir)/'`ffi.c diff --git a/moo/mod/console.h b/moo/mod/_con.h similarity index 92% rename from moo/mod/console.h rename to moo/mod/_con.h index 9a433d7..22c01a9 100644 --- a/moo/mod/console.h +++ b/moo/mod/_con.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MOO_MOD_CONSOLE_H_ -#define _MOO_MOD_CONSOLE_H_ +#ifndef _MOO_MOD_CON_H_ +#define _MOO_MOD_CON_H_ #include @@ -33,7 +33,7 @@ extern "C" { #endif -MOO_EXPORT int moo_mod_console (moo_t* moo, moo_mod_t* mod); +MOO_EXPORT int moo_mod_con (moo_t* moo, moo_mod_t* mod); #if defined(__cplusplus) }