Start faux lib instead lub

Doxyfile

@@ -790,7 +790,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = lub/str
+INPUT                  = faux/str
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

Makefile.am

@@ -8,15 +8,10 @@ VERSION_INFO = -version-info $(SONAME_CURRENT):$(SONAME_REVISION):$(SONAME_AGE)
 AM_LDFLAGS = $(VERSION_INFO)
 
 if DEBUG
-  DEBUG_CFLAGS = -DDEBUG
-endif
-
-if LEGACY
-  LEGACY_CFLAGS = -DLEGACY
+DEBUG_CFLAGS = -DDEBUG
 endif
 
 AM_CFLAGS = -Wall $(DEBUG_CFLAGS) $(LEGACY_CFLAGS)
-#AM_CFLAGS = -ansi -pedantic -Werror -Wall -D_POSIX_C_SOURCE=199309 -DVERSION=$(VERSION) $(DEBUG_CFLAGS)
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
@@ -24,28 +19,29 @@ lib_LIBRARIES =
 nobase_include_HEADERS =
 
 EXTRA_DIST = \
-	bin/module.am \
-	clish/module.am \
-	lub/Makefile.am \
-	tinyrl/module.am \
-	konf/module.am \
-	plugins/module.am \
-	libc/module.am \
-	doc/module.am \
-	contrib \
-	xml-examples \
-	debian \
-	clish.xsd \
-	LICENCE \
-	README \
-	CHANGES \
-	ISSUES
+	faux/Makefile.am
+
+#	bin/module.am \
+#	clish/module.am \
+#	tinyrl/module.am \
+#	konf/module.am \
+#	plugins/module.am \
+#	libc/module.am \
+#	doc/module.am \
+#	contrib \
+#	xml-examples \
+#	debian \
+#	clish.xsd \
+#	LICENCE \
+#	README \
+#	CHANGES \
+#	ISSUES
 
-include $(top_srcdir)/lub/Makefile.am
-include $(top_srcdir)/tinyrl/module.am
-include $(top_srcdir)/konf/module.am
-include $(top_srcdir)/clish/module.am
-include $(top_srcdir)/bin/module.am
-include $(top_srcdir)/plugins/module.am
-include $(top_srcdir)/libc/module.am
-include $(top_srcdir)/doc/module.am
+include $(top_srcdir)/faux/Makefile.am
+#include $(top_srcdir)/tinyrl/module.am
+#include $(top_srcdir)/konf/module.am
+#include $(top_srcdir)/clish/module.am
+#include $(top_srcdir)/bin/module.am
+#include $(top_srcdir)/plugins/module.am
+#include $(top_srcdir)/libc/module.am
+#include $(top_srcdir)/doc/module.am

configure.ac

@@ -1,8 +1,8 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-m4_define([MAJOR_VERSION], 2)
-m4_define([MINOR_VERSION], 1)
-m4_define([MICRO_VERSION], 4)
+m4_define([MAJOR_VERSION], 3)
+m4_define([MINOR_VERSION], 0)
+m4_define([MICRO_VERSION], 0)
 
 AC_PREREQ(2.59)
 AC_INIT([klish],
@@ -629,7 +629,7 @@ AC_CHECK_HEADERS(dlfcn.h, [
 AC_SUBST([CLISH_PLUGIN_BUILTIN_LIST])
 AC_SUBST([CLISH_PLUGIN_BUILTIN_DEFS])
 AC_SUBST([CLISH_PLUGIN_BUILTIN_LIBS])
-AC_CONFIG_FILES([clish/plugin_builtin.c])
+#AC_CONFIG_FILES([clish/plugin_builtin.c])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

faux/Makefile.am

@@ -0,0 +1,44 @@
+lib_LTLIBRARIES += libfaux.la
+libfaux_la_SOURCES =
+libfaux_la_LIBADD =
+
+nobase_include_HEADERS += \
+	faux/str.h
+
+#    faux/argv.h \
+#    faux/bintree.h \
+#    faux/list.h \
+#    faux/ctype.h \
+#    faux/c_decl.h \
+#    faux/dump.h \
+#    faux/types.h \
+#    faux/system.h \
+#    faux/db.h \
+#    faux/ini.h \
+#    faux/log.h \
+#    faux/conv.h
+
+EXTRA_DIST += \
+	faux/str/Makefile.am
+
+#    faux/argv/module.am \
+#    faux/list/module.am \
+#    faux/ctype/module.am \
+#    faux/dump/module.am \
+#    faux/system/module.am \
+#    faux/db/module.am \
+#    faux/ini/module.am \
+#    faux/log/module.am \
+#    faux/conv/module.am \
+#    faux/README
+
+include $(top_srcdir)/faux/str/Makefile.am
+#include $(top_srcdir)/faux/argv/module.am
+#include $(top_srcdir)/faux/list/module.am
+#include $(top_srcdir)/faux/ctype/module.am
+#include $(top_srcdir)/faux/dump/module.am
+#include $(top_srcdir)/faux/system/module.am
+#include $(top_srcdir)/faux/db/module.am
+#include $(top_srcdir)/faux/ini/module.am
+#include $(top_srcdir)/faux/log/module.am
+#include $(top_srcdir)/faux/conv/module.am

faux/str/Makefile.am

@@ -0,0 +1,3 @@
+libfaux_la_SOURCES += \
+	faux/str/str.c
+

lub/str/str.c → faux/str/str.c

@@ -1,23 +1,17 @@
-/** @file string.c
+/** @file str.c
  * About this file2
  */
 
-#include "private.h"
-
 #include <stdlib.h>
 #include <string.h>
 
-#include "lub/ctype.h"
+#include "faux/ctype.h"
+#include "faux/str.h"
 
 const char *lub_string_esc_default = "`|$<>&()#;\\\"!";
 const char *lub_string_esc_regex = "^$.*+[](){}";
 const char *lub_string_esc_quoted = "\\\"";
 
-auf_str_free()
-auf_string_free()
-faux_str_free()
-faux_string_free()
-
 /** @brief Free the memory allocated for the string.
  *
  * Safely free the memory allocated for the string. You can use NULL

lub/Makefile.am

@@ -1,45 +0,0 @@
-## Process this file with automake to generate Makefile.in
-lib_LTLIBRARIES         += liblub.la
-liblub_la_SOURCES        =
-liblub_la_LIBADD         =
-
-nobase_include_HEADERS += \
-    lub/argv.h \
-    lub/bintree.h \
-    lub/list.h \
-    lub/ctype.h \
-    lub/c_decl.h \
-    lub/dump.h \
-    lub/string.h \
-    lub/types.h \
-    lub/system.h \
-    lub/db.h \
-    lub/ini.h \
-    lub/log.h \
-    lub/conv.h
-
-EXTRA_DIST +=   \
-    lub/argv/module.am \
-    lub/bintree/module.am \
-    lub/list/module.am \
-    lub/ctype/module.am \
-    lub/dump/module.am \
-    lub/string/module.am \
-    lub/system/module.am \
-    lub/db/module.am \
-    lub/ini/module.am \
-    lub/log/module.am \
-    lub/conv/module.am \
-    lub/README
-
-include $(top_srcdir)/lub/argv/module.am
-include $(top_srcdir)/lub/bintree/module.am
-include $(top_srcdir)/lub/list/module.am
-include $(top_srcdir)/lub/ctype/module.am
-include $(top_srcdir)/lub/dump/module.am
-include $(top_srcdir)/lub/str/Makefile.am
-include $(top_srcdir)/lub/system/module.am
-include $(top_srcdir)/lub/db/module.am
-include $(top_srcdir)/lub/ini/module.am
-include $(top_srcdir)/lub/log/module.am
-include $(top_srcdir)/lub/conv/module.am

lub/str/module.am

@@ -1,4 +0,0 @@
-liblub_la_SOURCES += \
-	lub/string/string.c \
-	lub/string/private.h
-

lub/str/private.h

@@ -1,4 +0,0 @@
-/*
- * private.h
- */
-#include "lub/string.h"