build: autogenerate exports/libwbclient.syms

metze
(cherry picked from commit 8e0fcd583a643a8f4240698efcbb177463534a82)
(This used to be commit 17ce13775423efffd8ddfb967e1e09b2f41849af)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 565927bce979103429d02979fb8f1cdd125eb37f..f5f11154eeb769b3011ae6a416e1a6c6698128a8 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -158,7 +158,12 @@ LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
 LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
 LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@
 LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@
-LIBWBCLIENT=@LIBWBCLIENT_SHARED@
+
+LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
+LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@
+LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
+LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@
+LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h
 
 LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
 LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@
@@ -1634,13 +1639,16 @@ $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
        @echo Linking non-shared library $@
        @-$(AR) -rc $@ $(LIBTDB_OBJ0)
 
-bin/libwbclient.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) @LIBTALLOC_SHARED@
+$(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
+       @$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS)
+
+$(LIBWBCLIENT_SHARED_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_SHARED@
        @echo Linking shared library $@
        @$(SHLD_DSO) @LIBTALLOC_LIBS@ $(LIBWBCLIENT_OBJ) \
                @SONAMEFLAG@`basename $@`.$(SONAME_VER)
        @ln -s -f `basename $@` $@.$(SONAME_VER)
 
-bin/libwbclient.a: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
+$(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
        @echo Linking non-shared library $@
        @-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
 
@@ -2327,7 +2335,7 @@ clean::
                $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBNETAPI) \
                bin/libwbclient.so.0 bin/timelimit \
                .headers.stamp */src/*.o \
-               $(LIBTALLOC_SYMS) $(LIBTDB_SYMS) $(LIBNETAPI_SYMS)
+               $(LIBTALLOC_SYMS) $(LIBWBCLIENT_SYMS) $(LIBTDB_SYMS) $(LIBNETAPI_SYMS)
        -rm -rf t_dir
 
 include/build_env.h: script/build_env.sh

diff --git a/source3/configure.in b/source3/configure.in
index 561e2278b05c35e8ec6906995ddd8ba1ea83cf7c..451de890352a3bb6396673505758137e7409a8cb 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -86,7 +86,9 @@ AC_SUBST(LIBADDNS)
 
 AC_SUBST(INSTALL_LIBWBCLIENT)
 AC_SUBST(UNINSTALL_LIBWBCLIENT)
+AC_SUBST(LIBWBCLIENT_SHARED_TARGET)
 AC_SUBST(LIBWBCLIENT_SHARED)
+AC_SUBST(LIBWBCLIENT_STATIC_TARGET)
 AC_SUBST(LIBWBCLIENT_STATIC)
 AC_SUBST(LIBWBCLIENT)
 AC_SUBST(WINBIND_LIBS)
@@ -5726,12 +5728,14 @@ if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_S
        NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
        ## Only worry about libwbclient if we have shared library support
        ## and winbindd
+        LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
         LIBWBCLIENT_SHARED=bin/libwbclient.$SHLIBEXT
         LIBWBCLIENT=libwbclient
        INSTALL_LIBWBCLIENT=installlibwbclient
        UNINSTALL_LIBWBCLIENT=uninstalllibwbclient
        WINBIND_LIBS="-lwbclient"
 else
+       LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
        LIBWBCLIENT_STATIC=bin/libwbclient.a
 fi
 

diff --git a/source3/exports/libwbclient.syms b/source3/exports/libwbclient.syms
deleted file mode 100644 (file)
index f1e68b4..0000000
--- a/source3/exports/libwbclient.syms
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-       global: wbc*;
-       local: *;
-};