build: fix shlibs target after internal changes, add libs target.
authorMichael Adam <obnox@samba.org>
Mon, 7 Jul 2008 15:32:18 +0000 (17:32 +0200)
committerKarolin Seeger <kseeger@samba.org>
Mon, 18 Aug 2008 12:59:57 +0000 (14:59 +0200)
The shlibs target now only builds the shared libs as the name suggests.
All libraries are built by the new "libs" target.

Michael
(cherry picked from commit 1bb2b576a4fb546f51f1ad70ba8e8b3a86bff2c2)
(cherry picked from commit 196cf8307291aafb65db6291f3c55fdd33a2de85)

source/Makefile.in

index e81adce96c139d9c9de4e4012163ef67c26143a1..6a0bbb7e7898996db82963c0312ef9359f0490d4 100644 (file)
@@ -1061,7 +1061,7 @@ VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
 ######################################################################
 # 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)
@@ -1497,10 +1497,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)
+
 
 #-------------------------------------------------------------------
 #
@@ -2659,7 +2669,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