libwbclient: remove async libwbclient and talloc from libwbclient.so

Except for tests there is right now no active user of this. We can easily
re-add this when smbd makes more use of it.

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6cfa85dbc522fa4f01c33f7676defc6721b91061..78c81c40d72b1b0f74851b924be294ab5b72c035 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1058,6 +1058,8 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/uta
 SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
        $(LIBSMB_OBJ) $(LDB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
        @LIBWBCLIENT_STATIC@ \
+        ../nsswitch/libwbclient/wbc_async.o \
+        ../nsswitch/libwbclient/wb_reqtrans.o \
        $(LIBNDR_GEN_OBJ0)
 
 MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) $(KRBCLIENT_OBJ) \
@@ -2018,45 +2020,34 @@ LIBWBCLIENT_OBJ0 = ../nsswitch/libwbclient/wbclient.o \
                  ../nsswitch/libwbclient/wbc_guid.o \
                  ../nsswitch/libwbclient/wbc_pam.o
 
-LIBWBCLIENT_OBJ_ASYNC = ../nsswitch/libwbclient/wb_reqtrans.o \
-                 ../nsswitch/libwbclient/wbc_async.o \
-                 ../nsswitch/libwbclient/wbc_util_async.o\
-                 ../nsswitch/libwbclient/wbc_idmap_async.o \
-                 ../nsswitch/libwbclient/wbc_sid_async.o \
-                 ../nsswitch/libwbclient/wbc_pam_async.o
-
 LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
-                 $(LIBWBCLIENT_OBJ_ASYNC) \
                  $(WBCOMMON_OBJ) \
                  $(LIBREPLACE_OBJ) \
-                 ../lib/async_req/async_sock.o \
-                 ../lib/util/tevent_unix.o \
                  ../lib/util/blocking.o \
-                 $(SOCKET_WRAPPER_OBJ) @LIBTEVENT_OBJ0@
+                 $(SOCKET_WRAPPER_OBJ)
 
 LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
 LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
 LIBWBCLIENT_SHARED_TARGET_SONAME=$(LIBWBCLIENT_SHARED_TARGET).$(LIBWBCLIENT_SOVER)
 LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@
 LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@
-LIBWBCLIENT_HEADERS=$(srcdir)/../nsswitch/libwbclient/wbclient.h \
-                   $(srcdir)/../nsswitch/libwbclient/wbc_async.h
+LIBWBCLIENT_HEADERS=$(srcdir)/../nsswitch/libwbclient/wbclient.h
 
 $(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
        @$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS)
 
-$(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) $(LIBTALLOC)
+$(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS)
        @echo Linking shared library $@
-       @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) $(LIBTALLOC_LIBS) $(LIBREPLACE_LIBS) \
+       @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) $(LIBREPLACE_LIBS) \
                @SONAMEFLAG@`basename $@`
 
 $(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
        @rm -f $@
        @ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
 
-$(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(LIBWBCLIENT_OBJ_ASYNC) $(WBCOMMON_OBJ)
+$(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
        @echo Linking non-shared library $@
-       @-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(LIBWBCLIENT_OBJ_ASYNC) $(WBCOMMON_OBJ)
+       @-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
 
 libwbclient: $(LIBWBCLIENT)