fixed some build file issues
This commit is contained in:
parent
b2fb361df4
commit
68a455e128
6
moo/configure
vendored
6
moo/configure
vendored
@ -19897,15 +19897,15 @@ else
|
||||
fi
|
||||
|
||||
|
||||
test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module="yes"
|
||||
test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module_is="yes"
|
||||
|
||||
if test "${enable_static_module}" = "yes"
|
||||
if test "${enable_static_module_is}" = "yes"
|
||||
then
|
||||
|
||||
$as_echo "#define MOO_ENABLE_STATIC_MODULE /**/" >>confdefs.h
|
||||
|
||||
fi
|
||||
if test "${enable_static_module}" = "yes"; then
|
||||
if test "${enable_static_module_is}" = "yes"; then
|
||||
ENABLE_STATIC_MODULE_TRUE=
|
||||
ENABLE_STATIC_MODULE_FALSE='#'
|
||||
else
|
||||
|
@ -408,13 +408,13 @@ AC_ARG_ENABLE([static-module],
|
||||
enable_static_module_is=no
|
||||
)
|
||||
|
||||
test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module="yes"
|
||||
test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module_is="yes"
|
||||
|
||||
if test "${enable_static_module}" = "yes"
|
||||
if test "${enable_static_module_is}" = "yes"
|
||||
then
|
||||
AC_DEFINE([MOO_ENABLE_STATIC_MODULE],[],[link modules statically into the main library])
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_STATIC_MODULE, test "${enable_static_module}" = "yes")
|
||||
AM_CONDITIONAL(ENABLE_STATIC_MODULE, test "${enable_static_module_is}" = "yes")
|
||||
|
||||
AC_SUBST(MOO_SIZEOF_WCHAR_T, $ac_cv_sizeof_wchar_t)
|
||||
AC_SUBST(MOO_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long)
|
||||
|
@ -27,7 +27,6 @@ pkgincludedir = $(includedir)
|
||||
pkglibdir = $(libdir)
|
||||
|
||||
pkginclude_HEADERS = \
|
||||
moo-cfg.h \
|
||||
moo-cmn.h \
|
||||
moo-rbt.h \
|
||||
moo-utl.h \
|
||||
|
@ -397,7 +397,6 @@ CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL) \
|
||||
LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined
|
||||
LIBADD_LIB_COMMON = $(LIBM) $(LIBLTDL)
|
||||
pkginclude_HEADERS = \
|
||||
moo-cfg.h \
|
||||
moo-cmn.h \
|
||||
moo-rbt.h \
|
||||
moo-utl.h \
|
||||
|
@ -41,7 +41,7 @@ pkgmodexecdir = $(libdir)
|
||||
|
||||
pkgmodexec_LTLIBRARIES = libmoo-stdio.la libmoo-console.la
|
||||
|
||||
libmoo_stdio_la_SOURCES = stdio.c m-stdio.h
|
||||
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)
|
||||
|
@ -150,7 +150,7 @@ libmoo_console_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
|
||||
@ENABLE_STATIC_MODULE_TRUE@am_libmoo_console_la_rpath =
|
||||
@ENABLE_STATIC_MODULE_FALSE@libmoo_stdio_la_DEPENDENCIES = \
|
||||
@ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_1)
|
||||
am__libmoo_stdio_la_SOURCES_DIST = stdio.c m-stdio.h
|
||||
am__libmoo_stdio_la_SOURCES_DIST = stdio.c _stdio.h
|
||||
@ENABLE_STATIC_MODULE_FALSE@am_libmoo_stdio_la_OBJECTS = \
|
||||
@ENABLE_STATIC_MODULE_FALSE@ libmoo_stdio_la-stdio.lo
|
||||
@ENABLE_STATIC_MODULE_TRUE@am_libmoo_stdio_la_OBJECTS = \
|
||||
@ -397,7 +397,7 @@ CPPFLAGS_COMMON = -I$(abs_builddir) -I$(abs_builddir)/../lib \
|
||||
@ENABLE_STATIC_MODULE_TRUE@libmoo_console_la_SOURCES = console.c
|
||||
@ENABLE_STATIC_MODULE_FALSE@libmoo_console_la_CPPFLAGS = $(CPPFLAGS_COMMON)
|
||||
@ENABLE_STATIC_MODULE_TRUE@libmoo_console_la_CPPFLAGS = $(CPPFLAGS_COMMON)
|
||||
@ENABLE_STATIC_MODULE_FALSE@libmoo_stdio_la_SOURCES = stdio.c m-stdio.h
|
||||
@ENABLE_STATIC_MODULE_FALSE@libmoo_stdio_la_SOURCES = stdio.c _stdio.h
|
||||
@ENABLE_STATIC_MODULE_TRUE@libmoo_stdio_la_SOURCES = stdio.c
|
||||
@ENABLE_STATIC_MODULE_FALSE@libmoo_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON)
|
||||
@ENABLE_STATIC_MODULE_TRUE@libmoo_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON)
|
||||
|
Loading…
Reference in New Issue
Block a user