build: fix shlibs target after internal changes, add libs target.

The shlibs target now only builds the shared libs as the name suggests.
All libraries are built by the new "libs" target.

Michael

diff --git a/source/Makefile.in b/source/Makefile.in
index cd3aec8f1b217d64871916d955821cf0ad9fb316..a22c1d13c4f5c5c37c5f90e78454dc1aa7706766 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1081,7 +1081,7 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
 ######################################################################
 # now the rules...
 ######################################################################
-all:: SHOWFLAGS $(SHLIBS) $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
+all:: SHOWFLAGS $(LIBRARIES) $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
        $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
 
 nss_modules:: $(NSS_MODULES)
@@ -1518,10 +1518,20 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIB
 
 MKSYMS_SH = $(srcdir)/script/mksyms.sh
 
-SHLIBS = libtalloc libtdb @LIBWBCLIENT@ libsmbclient libsmbsharemodes libaddns libnetapi
+SHLIBS = @LIBTALLOC_SHARED@ \
+        @LIBTDB_SHARED@ \
+        @LIBWBCLIENT_SHARED@ \
+        @LIBSMBCLIENT_SHARED@ \
+        @LIBSMBSHAREMODES_SHARED@ \
+        @LIBADDNS_SHARED@ \
+        @LIBNETAPI_SHARED@
 
 shlibs: $(SHLIBS)
 
+LIBRARIES = libtalloc libtdb libwbclient libsmbclient libsmbsharemodes libaddns libnetapi
+
+libs: $(LIBRARIES)
+
 
 #-------------------------------------------------------------------
 #
@@ -2628,7 +2638,7 @@ test_shlibs:: $(SHLIBS)
        @echo "Testing $(SHLIBS) "
        @export $(LIB_PATH_VAR)=./bin && \
        for module in $(SHLIBS); do \
-               ./script/tests/dlopen.sh bin/$${module}.@SHLIBEXT@ \
+               ./script/tests/dlopen.sh $${module} \
                        || exit 1; \
        done