diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-07 17:32:18 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-07 20:34:03 +0200 |
| commit | 5408317e338c500e6329dfcb3ca9a84a8c761a90 (patch) | |
| tree | ee2542ada8802de0fbb03e3a9f935470943348f1 | |
| parent | eb48b5703b54c07e3d2d6fd791ee2f9b711cef25 (diff) | |
| download | samba-5408317e338c500e6329dfcb3ca9a84a8c761a90.tar.gz samba-5408317e338c500e6329dfcb3ca9a84a8c761a90.tar.bz2 samba-5408317e338c500e6329dfcb3ca9a84a8c761a90.zip | |
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
(This used to be commit 1bb2b576a4fb546f51f1ad70ba8e8b3a86bff2c2)
| -rw-r--r-- | source3/Makefile.in | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index cd3aec8f1b..a22c1d13c4 100644 --- a/source3/Makefile.in +++ b/source3/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 |