libbindle: adding ability to add symbol prefix

7 files changed, 150 insertions, 30 deletions

diff --git a/Makefile.am b/Makefile.am
index 0f12d19..e563a7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,34 +136,23 @@ endif
 # Makefile includes
 GIT_PACKAGE_VERSION_DIR=include
 SUBST_EXPRESSIONS =
-include $(srcdir)/build-aux/makefile-autotools.am
-include $(srcdir)/build-aux/makefile-subst.am
-include $(srcdir)/build-aux/makefile-version.am
+include build-aux/makefile-subst.am
+include build-aux/makefile-version.am
+include build-aux/makefile-libbindle.am
 
 
 # macros for lib/libbindle.a
 lib_libbindle_a_DEPENDENCIES            = Makefile \
-                                          config.h
+                                          config.h \
+                                          include/bindle_prefix.h
 lib_libbindle_a_CPPFLAGS                = $(AM_CPPFLAGS) \
                                           -I$(srcdir)/lib/libbindle
 lib_libbindle_a_CFLAGS                  = $(AM_CFLAGS)
-lib_libbindle_a_SOURCES                 = include/bindle.h \
-                                          lib/libbindle/libbindle.h \
-                                          lib/libbindle/ldebug.c \
-                                          lib/libbindle/ldebug.h \
-                                          lib/libbindle/lobj.c \
-                                          lib/libbindle/lobj.h \
-                                          lib/libbindle/lstring.c \
-                                          lib/libbindle/lstring.h \
-                                          lib/libbindle/lstrings.c \
-                                          lib/libbindle/lstrings.h \
-                                          lib/libbindle/lutf8.c \
-                                          lib/libbindle/lutf8.h
+lib_libbindle_a_SOURCES                 = $(libbindle_sources)
 
 
 # macros for lib/libbindle.la
-lib_libbindle_la_DEPENDENCIES           = Makefile \
-                                          config.h \
+lib_libbindle_la_DEPENDENCIES           = $(lib_libbindle_a_DEPENDENCIES) \
                                           lib/libbindle/libbindle.sym
 lib_libbindle_la_CPPFLAGS               = $(AM_CPPFLAGS) \
                                           -I$(srcdir)/lib/libbindle
@@ -172,7 +161,7 @@ lib_libbindle_la_LDFLAGS		= -rpath'$(libdir)' \
                                           -version-info $(LIB_VERSION_INFO) \
                                           $(AM_LDFLAGS) \
                                           -export-symbols $(srcdir)/lib/libbindle/libbindle.sym
-lib_libbindle_la_SOURCES                = $(lib_libbindle_a_SOURCES)
+lib_libbindle_la_SOURCES                = $(libbindle_sources)
 
 
 # custom targets
diff --git a/build-aux/makefile-libbindle.am b/build-aux/makefile-libbindle.am
new file mode 100644
index 0000000..c668bed
--- /dev/null
+++ b/build-aux/makefile-libbindle.am
@@ -0,0 +1,78 @@
+#
+#   Bindle Binaries Tools
+#   Copyright (C) 2022 David M. Syzdek <david@syzdek.net>.
+#
+#   Redistribution and use in source and binary forms, with or without
+#   modification, are permitted provided that the following conditions are
+#   met:
+#
+#      * Redistributions of source code must retain the above copyright
+#        notice, this list of conditions and the following disclaimer.
+#      * Redistributions in binary form must reproduce the above copyright
+#        notice, this list of conditions and the following disclaimer in the
+#        documentation and/or other materials provided with the distribution.
+#      * Neither the name of Bindle Binaries nor the
+#        names of its contributors may be used to endorse or promote products
+#        derived from this software without specific prior written permission.
+#
+#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+#   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+#   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BINDLE BINARIES BE LIABLE FOR
+#   ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+#   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+#   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+#   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+#
+
+EXTRA_DIST                              += $(bindletools_srcdir)/build-aux/makefile-libbindle.am
+EXTRA_DIST                              += $(bindletools_srcdir)/include/bindle.h
+BUILT_SOURCES                           += include/bindle_prefix.h
+EXTRA_DIST                              += include/bindle_prefix.h
+
+LIBBINDLE_PREFIX                        ?=
+
+libbindle_sources                       =  $(srcdir)/$(bindletools_srcdir)/include/bindle.h \
+                                           include/bindle_prefix.h \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/libbindle.h \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/ldebug.c \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/ldebug.h \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/lobj.c \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/lobj.h \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/lstring.c \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/lstring.h \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/lstrings.c \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/lstrings.h \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/lutf8.c \
+                                           $(srcdir)/$(bindletools_srcdir)/lib/libbindle/lutf8.h
+
+
+libbindle_symbol_list = $(EGREP) \
+        '^[[:space:]]{0,1}bindle_[_[:alnum:]]{1,}[\(\;][[:space:]]{0,}$$' \
+        $(libbindle_sources) \
+        |cut -d: -f2 \
+        |$(SED) -e 's/[[:space:]]//g' -e 's/[(;]$$//g' \
+        |sort \
+        |uniq
+
+
+include/bindle_prefix.h: $(libbindle_sources)
+        @if test "x$(V)" == "x0";then \
+           echo "  GEN      $(@)"; \
+        else \
+           echo "$(libbindle_symbol_list)"; \
+        fi; \
+        $(MKDIR_P) "`dirname "$(@)"`" || exit 1; \
+        rm -f $(@) || exit 1; \
+        touch $(@) || exit 1; \
+        for FUNC in `$(libbindle_symbol_list)`;do \
+           echo "#undef $$FUNC"; \
+           echo "#define $$FUNC $(LIBBINDLE_PREFIX)$$FUNC"; \
+        done > $(@); \
+        cat $(srcdir)/$(bindletools_srcdir)/include/bindle.h >> $(@); \
+        touch $(@);
+
+# end of automake file
diff --git a/configure.ac b/configure.ac
index d17ca5e..0e8fe79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,7 @@ AC_BINDLE_GIT_PACKAGE_VERSION([build-aux/git-package-version.sh])
 
 # custom configure options
 AC_BINDLE_ENABLE_WARNINGS([-Wno-unknown-pragmas -Wno-missing-format-attribute -Wno-poison-system-directories], [], [c11])
+AC_BINDLE_LIBBINDLE([])
 AC_BINDLETOOLS_LIBBINDLE
 
 # Creates outputs
diff --git a/include/bindle.h b/include/bindle.h
index a4378aa..28d8c2f 100644
--- a/include/bindle.h
+++ b/include/bindle.h
@@ -42,6 +42,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <sys/types.h>
+#include <stdatomic.h>
 
 
 //////////////
@@ -135,9 +136,16 @@ typedef struct _bindle_obj
 /////////////////
 #pragma mark - Variables
 
-extern const char *   bindle_debug_ident;
-extern int            bindle_debug_level;
-extern int            bindle_debug_syslog;
+_BINDLE_V const char *
+bindle_debug_ident;
+
+
+_BINDLE_V int
+bindle_debug_level;
+
+
+_BINDLE_V int
+bindle_debug_syslog;
 
 
 //////////////////
diff --git a/lib/libbindle/ldebug.c b/lib/libbindle/ldebug.c
index 7566af0..bbfceb0 100644
--- a/lib/libbindle/ldebug.c
+++ b/lib/libbindle/ldebug.c
@@ -46,7 +46,7 @@
 #include <strings.h>
 #include <unistd.h>
 #include <syslog.h>
-#include <stdatomic.h>
+#include <stdarg.h>
 #include <assert.h>
 
 
diff --git a/lib/libbindle/libbindle.h b/lib/libbindle/libbindle.h
index f74f59f..d6bb1ea 100644
--- a/lib/libbindle/libbindle.h
+++ b/lib/libbindle/libbindle.h
@@ -45,13 +45,11 @@
 #include <config.h>
 #endif
 
-#include <stddef.h>
-#include <stdint.h>
-#include <stdatomic.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include <bindle.h>
+#ifdef LIBBINDLE_PREFIX
+#   include <bindle_prefix.h>
+#else
+#   include <bindle.h>
+#endif
 
 
 //////////////
diff --git a/m4/bindle-libbindle.m4 b/m4/bindle-libbindle.m4
new file mode 100644
index 0000000..e9f3e72
--- /dev/null
+++ b/m4/bindle-libbindle.m4
@@ -0,0 +1,46 @@
+#
+#   Bindle Binaries Tools
+#   Copyright (C) 2022 David M. Syzdek <david@syzdek.net>.
+#
+#   Redistribution and use in source and binary forms, with or without
+#   modification, are permitted provided that the following conditions are
+#   met:
+#
+#      * Redistributions of source code must retain the above copyright
+#        notice, this list of conditions and the following disclaimer.
+#      * Redistributions in binary form must reproduce the above copyright
+#        notice, this list of conditions and the following disclaimer in the
+#        documentation and/or other materials provided with the distribution.
+#      * Neither the name of Bindle Binaries nor the
+#        names of its contributors may be used to endorse or promote products
+#        derived from this software without specific prior written permission.
+#
+#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+#   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+#   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BINDLE BINARIES BE LIABLE FOR
+#   ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+#   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+#   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+#   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+#   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+#
+
+
+# AC_BINDLE_LIBBINDLE()
+# ______________________________________________________________________________
+AC_DEFUN([AC_BINDLE_LIBBINDLE],[dnl
+
+   AC_REQUIRE([AC_PROG_CC])
+   AC_REQUIRE([AC_BINDLE])
+
+   LIBBINDLE_PREFIX="$1"
+
+   AC_SUBST([LIBBINDLE_PREFIX],                 [${LIBBINDLE_PREFIX}])
+   AC_DEFINE_UNQUOTED([LIBBINDLE_PREFIX],       ["$LIBBINDLE_PREFIX"],  [libbindle.la function prefix])
+])dnl
+
+
+# end of m4 file