added stix_compoocharsbcstr(), stix_compbcharsbcstr().

added code to handle statically linked modules. fixed more build issues
2016-12-31 17:19:40 +00:00 · 2016-12-31 17:19:40 +00:00 · 65b230da24
commit 65b230da24
parent 54dd7675b0
8 changed files with 83 additions and 65 deletions
--- a/stix/lib/Makefile.am
+++ b/stix/lib/Makefile.am
@ -60,8 +60,8 @@ libstix_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
 libstix_la_LIBADD = $(LIBADD_LIB_COMMON)

 if ENABLE_STATIC_MODULE
-libstix_la_LDFLAGS += -I$(abs_builddir)/../mod
-libstix_la_LIBADD += -lstix-stdio
+libstix_la_LDFLAGS += -L$(abs_builddir)/../mod
+libstix_la_LIBADD += -lstix-console -lstix-stdio -ltermcap
 endif

 bin_PROGRAMS = stix
--- a/stix/lib/Makefile.in
+++ b/stix/lib/Makefile.in
@ -83,8 +83,8 @@ host_triplet = @host@
 # to the first number in -version-info above
@WIN32_TRUE@am__append_1 = -DSTIX_DEFAULT_MODPREFIX=\"libstix-\" -DSTIX_DEFAULT_MODPOSTFIX=\"-1\"
@WIN32_FALSE@am__append_2 = -DSTIX_DEFAULT_MODPREFIX=\"$(libdir)/libstix-\" -DSTIX_DEFAULT_MODPOSTFIX=\"\"
-@ENABLE_STATIC_MODULE_TRUE@am__append_3 = -I$(abs_builddir)/../mod
-@ENABLE_STATIC_MODULE_TRUE@am__append_4 = -lstix-stdio
+@ENABLE_STATIC_MODULE_TRUE@am__append_3 = -L$(abs_builddir)/../mod
+@ENABLE_STATIC_MODULE_TRUE@am__append_4 = -lstix-console -lstix-stdio -ltermcap
 bin_PROGRAMS = stix$(EXEEXT)
 subdir = lib
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
--- a/stix/lib/exec.c
+++ b/stix/lib/exec.c
@ -2869,7 +2869,7 @@ int stix_getpfnum (stix_t* stix, const stix_ooch_t* ptr, stix_oow_t len)

 	for (i = 0; i < STIX_COUNTOF(pftab); i++)
 	{
-		if (stix_compucharsbcstr(ptr, len, pftab[i].name) == 0)
+		if (stix_compoocharsbcstr(ptr, len, pftab[i].name) == 0)
 		{
 			return i;
 		}
--- a/stix/lib/stix-utl.h
+++ b/stix/lib/stix-utl.h
@ -37,6 +37,7 @@ extern "C" {
 #	define stix_hashchars(ptr,len) stix_hashuchars(ptr,len)
 #	define stix_equaloochars(str1,str2,len) stix_equaluchars(str1,str2,len)
 #	define stix_compoocbcstr(str1,str2) stix_compucbcstr(str1,str2)
+#	define stix_compoocharsbcstr(str1,len1,str2) stix_compucharsbcstr(str1,len1,str2)
 #	define stix_compoocstr(str1,str2) stix_compucstr(str1,str2)
 #	define stix_copyoochars(dst,src,len) stix_copyuchars(dst,src,len)
 #	define stix_copybctooochars(dst,src,len) stix_copybtouchars(dst,src,len)
@ -48,6 +49,7 @@ extern "C" {
 #	define stix_hashchars(ptr,len) stix_hashbchars(ptr,len)
 #	define stix_equaloochars(str1,str2,len) stix_equalbchars(str1,str2,len)
 #	define stix_compoocbcstr(str1,str2) stix_compbcstr(str1,str2)
+#	define stix_compoocharsbcstr(str1,len1,str2) stix_compbcharsbcstr(str1,len1,str2)
 #	define stix_compoocstr(str1,str2) stix_compbcstr(str1,str2)
 #	define stix_copyoochars(dst,src,len) stix_copybchars(dst,src,len)
 #	define stix_copybctooochars(dst,src,len) stix_copybchars(dst,src,len)
@ -110,6 +112,12 @@ STIX_EXPORT int stix_compucharsbcstr (
 	const stix_bch_t* str2
 );

+STIX_EXPORT int stix_compbcharsbcstr (
+	const stix_bch_t* str1,
+	stix_oow_t        len,
+	const stix_bch_t* str2
+);
+
 STIX_EXPORT void stix_copyuchars (
 	stix_uch_t*       dst,
 	const stix_uch_t* src,
--- a/stix/lib/stix.c
+++ b/stix/lib/stix.c
@ -347,6 +347,23 @@ void stix_freemem (stix_t* stix, void* ptr)
 #define MOD_PREFIX "stix_mod_"
 #define MOD_PREFIX_LEN 9

+#if defined(STIX_ENABLE_STATIC_MODULE)
+
+#include "../mod/console.h"
+#include "../mod/_stdio.h"
+
+static struct
+{
+	stix_bch_t* modname;
+	int (*modload) (stix_t* stix, stix_mod_t* mod);
+}
+static_modtab[] = 
+{
+	{ "console", stix_mod_console },
+	{ "stdio",  stix_mod_stdio },
+};
+#endif
+
 stix_mod_data_t* stix_openmod (stix_t* stix, const stix_ooch_t* name, stix_oow_t namelen)
 {
 	stix_rbt_pair_t* pair;
@ -387,7 +404,7 @@ stix_mod_data_t* stix_openmod (stix_t* stix, const stix_ooch_t* name, stix_oow_t
 	/* TODO: binary search ... */
 	for (n = 0; n < STIX_COUNTOF(static_modtab); n++)
 	{
-		if (stix_compoocstr (static_modtab[n].modname, name, name_len....) == 0) 
+		if (stix_compoocharsbcstr (name, namelen, static_modtab[n].modname) == 0) 
 		{
 			load = static_modtab[n].modload;
 			break;
@ -405,12 +422,12 @@ stix_mod_data_t* stix_openmod (stix_t* stix, const stix_ooch_t* name, stix_oow_t
 		/* found the module in the staic module table */

 		STIX_MEMSET (&md, 0, STIX_SIZEOF(md));
-		stix_copyoochars (md.name, name, namelen);
+		stix_copyoochars ((stix_ooch_t*)md.mod.name, name, namelen);
 		/* Note md.handle is STIX_NULL for a static module */

 		/* i copy-insert 'md' into the table before calling 'load'.
 		 * to pass the same address to load(), query(), etc */
-		pair = stix_rbt_insert (stix->modtab, name, namelen, &md, STIX_SIZEOF(md));
+		pair = stix_rbt_insert (&stix->modtab, (stix_ooch_t*)name, namelen, &md, STIX_SIZEOF(md));
 		if (pair == STIX_NULL)
 		{
 			stix->errnum = STIX_ESYSMEM;
@ -418,9 +435,9 @@ stix_mod_data_t* stix_openmod (stix_t* stix, const stix_ooch_t* name, stix_oow_t
 		}

 		mdp = (stix_mod_data_t*)STIX_RBT_VPTR(pair);
-		if (load (&mdp->mod, stix) <= -1)
+		if (load (stix, &mdp->mod) <= -1)
 		{
-			stix_rbt_delete (stix->modtab, segs[0].ptr, segs[0].len);
+			stix_rbt_delete (&stix->modtab, (stix_ooch_t*)name, namelen);
 			return STIX_NULL;
 		}

--- a/stix/lib/utl.c
+++ b/stix/lib/utl.c
@ -119,6 +119,15 @@ int stix_compucharsbcstr (const stix_uch_t* str1, stix_oow_t len, const stix_bch
 	return (*str1 > *str2)? 1: -1;
 }

+int stix_compbcharsbcstr (const stix_bch_t* str1, stix_oow_t len, const stix_bch_t* str2)
+{
+	const stix_bch_t* end = str1 + len;
+	while (str1 < end && *str2 != '\0' && *str1 == *str2) str1++, str2++;
+	if (str1 == end && *str2 == '\0') return 0;
+	if (*str1 == *str2) return (str1 < end)? 1: -1;
+	return (*str1 > *str2)? 1: -1;
+}
+
 void stix_copyuchars (stix_uch_t* dst, const stix_uch_t* src, stix_oow_t len)
 {
 	stix_oow_t i;
--- a/stix/mod/Makefile.am
+++ b/stix/mod/Makefile.am
@ -5,7 +5,7 @@ CPPFLAGS_COMMON = \
 	-I$(abs_builddir)/../lib \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
-	-I$(includedir)
+	-I$(includedir) -fPIC

 if WIN32
 # you must adjust the value of DEFAULT_MODPOSTFIX according 
@ -21,10 +21,13 @@ if ENABLE_STATIC_MODULE
 # STATIC MODULES BUILT INTO MAIN LIBRARY
 ##################################################

-noinst_LIBRARIES = libstix-stdio.a
+noinst_LTLIBRARIES = libstix-console.la libstix-stdio.la

-libstix_stdio_a_SOURCES = stdio.c 
-libstix_stdio_a_CPPFLAGS = $(CPPFLAGS_COMMON)
+libstix_console_la_SOURCES = console.c 
+libstix_console_la_CPPFLAGS = $(CPPFLAGS_COMMON)
+
+libstix_stdio_la_SOURCES = stdio.c 
+libstix_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON)

 else

--- a/stix/mod/Makefile.in
+++ b/stix/mod/Makefile.in
@ -14,7 +14,6 @@

@SET_MAKE@

-
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@ -100,18 +99,6 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/lib/stix-cfg.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-AM_V_AR = $(am__v_AR_@AM_V@)
-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo "  AR      " $@;
-am__v_AR_1 = 
-libstix_stdio_a_AR = $(AR) $(ARFLAGS)
-libstix_stdio_a_LIBADD =
-am__libstix_stdio_a_SOURCES_DIST = stdio.c
-@ENABLE_STATIC_MODULE_TRUE@am_libstix_stdio_a_OBJECTS =  \
-@ENABLE_STATIC_MODULE_TRUE@	libstix_stdio_a-stdio.$(OBJEXT)
-libstix_stdio_a_OBJECTS = $(am_libstix_stdio_a_OBJECTS)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@ -140,13 +127,15 @@ am__uninstall_files_from_dir = { \
         $(am__cd) "$$dir" && rm -f $$files; }; \
  }
 am__installdirs = "$(DESTDIR)$(pkgmodexecdir)"
-LTLIBRARIES = $(pkgmodexec_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkgmodexec_LTLIBRARIES)
 am__DEPENDENCIES_1 =
@ENABLE_STATIC_MODULE_FALSE@libstix_console_la_DEPENDENCIES =  \
@ENABLE_STATIC_MODULE_FALSE@	$(am__DEPENDENCIES_1)
 am__libstix_console_la_SOURCES_DIST = console.c console.h
@ENABLE_STATIC_MODULE_FALSE@am_libstix_console_la_OBJECTS =  \
@ENABLE_STATIC_MODULE_FALSE@	libstix_console_la-console.lo
+@ENABLE_STATIC_MODULE_TRUE@am_libstix_console_la_OBJECTS =  \
+@ENABLE_STATIC_MODULE_TRUE@	libstix_console_la-console.lo
 libstix_console_la_OBJECTS = $(am_libstix_console_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@ -158,11 +147,14 @@ libstix_console_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(LDFLAGS) -o $@
@ENABLE_STATIC_MODULE_FALSE@am_libstix_console_la_rpath = -rpath \
@ENABLE_STATIC_MODULE_FALSE@	$(pkgmodexecdir)
+@ENABLE_STATIC_MODULE_TRUE@am_libstix_console_la_rpath =
@ENABLE_STATIC_MODULE_FALSE@libstix_stdio_la_DEPENDENCIES =  \
@ENABLE_STATIC_MODULE_FALSE@	$(am__DEPENDENCIES_1)
 am__libstix_stdio_la_SOURCES_DIST = stdio.c m-stdio.h
@ENABLE_STATIC_MODULE_FALSE@am_libstix_stdio_la_OBJECTS =  \
@ENABLE_STATIC_MODULE_FALSE@	libstix_stdio_la-stdio.lo
+@ENABLE_STATIC_MODULE_TRUE@am_libstix_stdio_la_OBJECTS =  \
+@ENABLE_STATIC_MODULE_TRUE@	libstix_stdio_la-stdio.lo
 libstix_stdio_la_OBJECTS = $(am_libstix_stdio_la_OBJECTS)
 libstix_stdio_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@ -170,6 +162,7 @@ libstix_stdio_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	-o $@
@ENABLE_STATIC_MODULE_FALSE@am_libstix_stdio_la_rpath = -rpath \
@ENABLE_STATIC_MODULE_FALSE@	$(pkgmodexecdir)
+@ENABLE_STATIC_MODULE_TRUE@am_libstix_stdio_la_rpath =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@ -204,10 +197,8 @@ 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 = $(libstix_stdio_a_SOURCES) $(libstix_console_la_SOURCES) \
-	$(libstix_stdio_la_SOURCES)
-DIST_SOURCES = $(am__libstix_stdio_a_SOURCES_DIST) \
-	$(am__libstix_console_la_SOURCES_DIST) \
+SOURCES = $(libstix_console_la_SOURCES) $(libstix_stdio_la_SOURCES)
+DIST_SOURCES = $(am__libstix_console_la_SOURCES_DIST) \
 	$(am__libstix_stdio_la_SOURCES_DIST)
 am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
@ -395,15 +386,21 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = nostdinc
 CPPFLAGS_COMMON = -I$(abs_builddir) -I$(abs_builddir)/../lib \
-	-I$(abs_srcdir) -I$(abs_srcdir)/../lib -I$(includedir) \
+	-I$(abs_srcdir) -I$(abs_srcdir)/../lib -I$(includedir) -fPIC \
 	$(am__append_1) $(am__append_2)

 ##################################################
 # STATIC MODULES BUILT INTO MAIN LIBRARY
 ##################################################
-@ENABLE_STATIC_MODULE_TRUE@noinst_LIBRARIES = libstix-stdio.a
-@ENABLE_STATIC_MODULE_TRUE@libstix_stdio_a_SOURCES = stdio.c 
-@ENABLE_STATIC_MODULE_TRUE@libstix_stdio_a_CPPFLAGS = $(CPPFLAGS_COMMON)
+@ENABLE_STATIC_MODULE_TRUE@noinst_LTLIBRARIES = libstix-console.la libstix-stdio.la
+@ENABLE_STATIC_MODULE_FALSE@libstix_console_la_SOURCES = console.c console.h
+@ENABLE_STATIC_MODULE_TRUE@libstix_console_la_SOURCES = console.c 
+@ENABLE_STATIC_MODULE_FALSE@libstix_console_la_CPPFLAGS = $(CPPFLAGS_COMMON)
+@ENABLE_STATIC_MODULE_TRUE@libstix_console_la_CPPFLAGS = $(CPPFLAGS_COMMON)
+@ENABLE_STATIC_MODULE_FALSE@libstix_stdio_la_SOURCES = stdio.c m-stdio.h
+@ENABLE_STATIC_MODULE_TRUE@libstix_stdio_la_SOURCES = stdio.c 
+@ENABLE_STATIC_MODULE_FALSE@libstix_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON)
+@ENABLE_STATIC_MODULE_TRUE@libstix_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON)

 ##################################################
 # DYNAMIC MODULES 
@ -412,12 +409,8 @@ CPPFLAGS_COMMON = -I$(abs_builddir) -I$(abs_builddir)/../lib \
@ENABLE_STATIC_MODULE_FALSE@LIBADD_COMMON = -lstix
@ENABLE_STATIC_MODULE_FALSE@pkgmodexecdir = $(libdir)
@ENABLE_STATIC_MODULE_FALSE@pkgmodexec_LTLIBRARIES = libstix-stdio.la libstix-console.la
-@ENABLE_STATIC_MODULE_FALSE@libstix_stdio_la_SOURCES = stdio.c m-stdio.h
-@ENABLE_STATIC_MODULE_FALSE@libstix_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON)
@ENABLE_STATIC_MODULE_FALSE@libstix_stdio_la_LDFLAGS = $(LDFLAGS_COMMON)
@ENABLE_STATIC_MODULE_FALSE@libstix_stdio_la_LIBADD = $(LIBADD_COMMON)
-@ENABLE_STATIC_MODULE_FALSE@libstix_console_la_SOURCES = console.c console.h
-@ENABLE_STATIC_MODULE_FALSE@libstix_console_la_CPPFLAGS = $(CPPFLAGS_COMMON)
@ENABLE_STATIC_MODULE_FALSE@libstix_console_la_LDFLAGS = $(LDFLAGS_COMMON)
@ENABLE_STATIC_MODULE_FALSE@libstix_console_la_LIBADD = $(LIBADD_COMMON) -ltermcap 
 all: all-am
@ -455,13 +448,16 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):

-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-libstix-stdio.a: $(libstix_stdio_a_OBJECTS) $(libstix_stdio_a_DEPENDENCIES) $(EXTRA_libstix_stdio_a_DEPENDENCIES) 
-	$(AM_V_at)-rm -f libstix-stdio.a
-	$(AM_V_AR)$(libstix_stdio_a_AR) libstix-stdio.a $(libstix_stdio_a_OBJECTS) $(libstix_stdio_a_LIBADD)
-	$(AM_V_at)$(RANLIB) libstix-stdio.a
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}

 install-pkgmodexecLTLIBRARIES: $(pkgmodexec_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@ -511,7 +507,6 @@ distclean-compile:
 	-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstix_console_la-console.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstix_stdio_a-stdio.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstix_stdio_la-stdio.Plo@am__quote@

 .c.o:
@ -538,20 +533,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

-libstix_stdio_a-stdio.o: stdio.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstix_stdio_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstix_stdio_a-stdio.o -MD -MP -MF $(DEPDIR)/libstix_stdio_a-stdio.Tpo -c -o libstix_stdio_a-stdio.o `test -f 'stdio.c' || echo '$(srcdir)/'`stdio.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libstix_stdio_a-stdio.Tpo $(DEPDIR)/libstix_stdio_a-stdio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stdio.c' object='libstix_stdio_a-stdio.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstix_stdio_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstix_stdio_a-stdio.o `test -f 'stdio.c' || echo '$(srcdir)/'`stdio.c
-
-libstix_stdio_a-stdio.obj: stdio.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstix_stdio_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstix_stdio_a-stdio.obj -MD -MP -MF $(DEPDIR)/libstix_stdio_a-stdio.Tpo -c -o libstix_stdio_a-stdio.obj `if test -f 'stdio.c'; then $(CYGPATH_W) 'stdio.c'; else $(CYGPATH_W) '$(srcdir)/stdio.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libstix_stdio_a-stdio.Tpo $(DEPDIR)/libstix_stdio_a-stdio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stdio.c' object='libstix_stdio_a-stdio.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstix_stdio_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstix_stdio_a-stdio.obj `if test -f 'stdio.c'; then $(CYGPATH_W) 'stdio.c'; else $(CYGPATH_W) '$(srcdir)/stdio.c'; fi`
-
 libstix_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) $(libstix_console_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstix_console_la-console.lo -MD -MP -MF $(DEPDIR)/libstix_console_la-console.Tpo -c -o libstix_console_la-console.lo `test -f 'console.c' || echo '$(srcdir)/'`console.c
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libstix_console_la-console.Tpo $(DEPDIR)/libstix_console_la-console.Plo
@ -656,7 +637,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(pkgmodexecdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@ -693,7 +674,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am

-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 	clean-pkgmodexecLTLIBRARIES mostlyclean-am

 distclean: distclean-am
@ -765,7 +746,7 @@ uninstall-am: uninstall-pkgmodexecLTLIBRARIES
 .MAKE: install-am install-strip

 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES \
+	clean-libtool clean-noinstLTLIBRARIES \
 	clean-pkgmodexecLTLIBRARIES cscopelist-am ctags ctags-am \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \