The branch, v3-devel has been updated via 6ad2090391a92ebe822b2d7b80e180c251dc8e7a (commit) via 702c0bc04668117e3521d687b9b5a87fd7e0f1b1 (commit) via c3c3dadcab81f0a1ae8834e85e7e80a3da6601fb (commit) via ead9b9d7167d999d73cf4111f3b321236aac2a15 (commit) from a75055be5ff7ebe3476cfac86c6597a56a843c23 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log ----------------------------------------------------------------- commit 6ad2090391a92ebe822b2d7b80e180c251dc8e7a Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 14:56:18 2008 +0200 build: fix bug #5590 by not linking in the static libs but the objects. Michael commit 702c0bc04668117e3521d687b9b5a87fd7e0f1b1 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 14:55:24 2008 +0200 build: fall down to the same place when using an internal lib statically. Michael commit c3c3dadcab81f0a1ae8834e85e7e80a3da6601fb Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 14:47:26 2008 +0200 build: remove duplicated and hardcoded definition of LIBSMBSHAREMODES Michael commit ead9b9d7167d999d73cf4111f3b321236aac2a15 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 13:22:13 2008 +0200 build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency. Michael ----------------------------------------------------------------------- Summary of changes: source/Makefile.in | 10 ++++------ source/m4/aclocal.m4 | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 8e76dcf..d026e52 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1824,7 +1824,7 @@ shlibs test_shlibs: @LIBADDNS_SHARED@ # #------------------------------------------------------------------- -LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ +LIBNETAPI_OBJ0 = lib/netapi/netapi.o \ lib/netapi/cm.o \ librpc/gen_ndr/ndr_libnetapi.o \ lib/netapi/libnetapi.o \ @@ -1837,7 +1837,7 @@ LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ lib/netapi/samr.o \ lib/netapi/sid.o -LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \ +LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \ $(LIBSMBCONF_OBJ) \ $(REG_SMBCONF_OBJ) \ $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \ @@ -1869,9 +1869,9 @@ $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME) @rm -f $@ @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@ -$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) +$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBNETAPI_OBJ1) + @-$(AR) -rc $@ $(LIBNETAPI_OBJ0) libnetapi: $(LIBNETAPI) @@ -1989,8 +1989,6 @@ LIBSMBSHAREMODES=$(LIBSMBSHAREMODES_STATIC_TARGET) @LIBSMBSHAREMODES_SHARED@ #LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@ LIBSMBSHAREMODES_HEADERS=$(srcdir)/include/smb_share_modes.h -LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ - $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \ diff --git a/source/m4/aclocal.m4 b/source/m4/aclocal.m4 index 53ad46c..9a4213d 100644 --- a/source/m4/aclocal.m4 +++ b/source/m4/aclocal.m4 @@ -139,7 +139,7 @@ if eval test x"$build_lib" = "xyes" ; then LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET] AC_MSG_RESULT(yes) if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then - LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET] + enable_static=yes else LIBUC[_LIBS]=LIBLIBS fi @@ -152,7 +152,7 @@ else AC_MSG_RESULT(shared library not selected, but will supply static library) fi if test $enable_static = yes; then - LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET] + LIBUC[_STATIC]=[\$\(]LIBUC[_OBJ0\)] fi m4_popdef([LIBNAME]) -- Samba Shared Repository