[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-3147-gbae7bd4
Michael Adam
obnox at samba.org
Mon Jul 7 18:35:37 GMT 2008
The branch, v3-3-test has been updated
via bae7bd4bba4d49edec9cb58d47c1cb82aba16c6b (commit)
via 4d6edcb2c8bd516e09a864d1990675ba9bcec796 (commit)
via 76f9e2e64644c6f21baf523b91455dc3aebb2163 (commit)
via e2699b7f86302e5c770f8e3160f72f070d700b6c (commit)
via 3c300f9f8cffb5af32e291ec75007ab98fe96561 (commit)
via d9d92b64275127e29c80dbdc7cfe193289fef9a3 (commit)
via 887b6231198ce2ff6230e0939ddcf46759bc88bf (commit)
via 1bb2b576a4fb546f51f1ad70ba8e8b3a86bff2c2 (commit)
via 35b2ee2bce93f6e659f95d91b0590edd02c9b348 (commit)
via 5712062d22237768a671aa918e39a22d290b0f0a (commit)
via 39a447a232d0afbef55437a995f557553cbc8a0e (commit)
via bbf665ad5790e89ff01867e2762fe2b94db7277d (commit)
via af971f79c7d736eb5b7ae8fcd4b2bf7ccf4834f3 (commit)
via b871cb0cb6d32e5e97666bd429d0fb9940ae4b2e (commit)
via 61157cb92ec2c12e565fb088170c7f430e3b5b77 (commit)
via 20a5053f0e75176e9ec1d4fd5a18626bbe3a0267 (commit)
via 1157048146084e9ab34d7c2e77e8d00b22df53a4 (commit)
via 278dde8a6c486505c2d7403103ba011e1abb039e (commit)
via 879b000fd3ad123f64017071a6aaa17cdc926995 (commit)
via 95a7d21d3150ca9c24d48cf6a2976dcc1dfaaa05 (commit)
via c463bd0cb9927176eec89e25788c6ea78eafdd16 (commit)
via f440538c9480134ff05cf9c9f78a565808161101 (commit)
via 40ff40de5780fb17567b8d5ea75f5bb7f8d811c4 (commit)
via ed3c35d307456601ca00d88a5cc278d6604681e1 (commit)
via 36c99a3cad3c938a874f9b9f37c2265045957099 (commit)
via e01a1d8d651f680ca58b809dc569ff74592d53a9 (commit)
via 2712dade9d6495f3dbb75876ec32d73f8bb93f9f (commit)
via 922b136ada1c502edcbbb89e9cca155cd6ad376c (commit)
via beab1a31484836014aab5d2bcb38995435f6218b (commit)
via 8f64706b095b9ca0e2a8f39cc3133bfd02f86158 (commit)
via f94b07f0c56928f890ffb1e2aca2c8bfcc954dd5 (commit)
via 21b6164795344cea45161bc01828ec1127b5b6ab (commit)
via 59e7827e557c5096fb363051a4cf1835b2a53223 (commit)
via ff62887a94a7dd6f09995c820db7d825828bacad (commit)
via d9af2f7ab6b839e8074a69ce5d1fe66548c08e52 (commit)
via da29e1ce44d4f99b876259fbad892691e2c7d7e0 (commit)
via c50c847f4b9772261f8011f32eec97d8244dccdd (commit)
via 5c090762f769b645c411333aef2085362bb2e6cb (commit)
via ebfe13b79b24791bd9c854ac2f239f02796da6bb (commit)
via 662d666b41b11ae70daf7422b1ced5f86209e608 (commit)
via a4de301af48f4e5b4898751e8836bdb434d047a6 (commit)
via b330892f4b2f9f50fd192e37720217d15fedf1f0 (commit)
via 4092059ff0bbb638c937c3f2b977ad431d868331 (commit)
via 53cc6a3225c0c7baea4d8ea04eefc61283650434 (commit)
via 3de000890447dd15962fbd6a9b1b3504b9bd1175 (commit)
via 52ccb52c8e42e748fcc05337849945ddc30d5efa (commit)
via 01b1e642d72ecccac5277b5f071aab8f6df04c0d (commit)
via 5d3c6c3c1c08747c521292ef09648ad528c2dca9 (commit)
via 4b6ef6202cd9b6e1e8949c43d0c45c04d4b97438 (commit)
via d913b1e7316e84c1430f9d577f49d3c3e4e7719b (commit)
via 49919889892f258cc669b08417e7569e8f5efaf4 (commit)
via 946537e6bec904d4a7937eeb6085dfac19c3e2b5 (commit)
via b8d13f8773f61863b71bfc9df468f0018b0db0d1 (commit)
from 8cfc6afc7b4a6af9aea5f5a7cb5af7e3218c2d75 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit bae7bd4bba4d49edec9cb58d47c1cb82aba16c6b
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 18:32:50 2008 +0200
build: fix creation of libsmbclient.a - don't link in libtalloc.a
a step in fixing bug #5590
Michael
commit 4d6edcb2c8bd516e09a864d1990675ba9bcec796
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 18:30:12 2008 +0200
build: fix creation of libaddns.a - don't link in libtalloc.a
a step in fixing bug #5590
Michael
commit 76f9e2e64644c6f21baf523b91455dc3aebb2163
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 11:57:43 2008 +0200
build: fix creation of libsmbsharemodes.a - don't link in libtdb.a.
a step in fixing bug #5590
Michael
commit e2699b7f86302e5c770f8e3160f72f070d700b6c
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 17:42:59 2008 +0200
build: remove library-versions.in - it is not used any more.
Michael
commit 3c300f9f8cffb5af32e291ec75007ab98fe96561
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 17:35:08 2008 +0200
build: set SONAME version of libraries from configure, not using library-versions
This sets the library versions (previously gotten from library-versions
file during make) already at configure time.
For library "foo", the version is stored in the LIBFOO_SOVER configure
variable. For all libraries except libwbclient, this is done through the
call of SMB_LIBRARY().
NOTE: Currently the versions are hard-coded in the SMB_LIBRARY() calls in
configure.in, but this change makes it easier to retrieve the version from
the libraries source dir at configure time, e.g. for talloc and tdb.
Michael
commit d9d92b64275127e29c80dbdc7cfe193289fef9a3
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 17:34:00 2008 +0200
build: extend SMB_LIBRARY() to take a version as an optional second argument
This will allow transition away from library-versions in the next step.
Michael
commit 887b6231198ce2ff6230e0939ddcf46759bc88bf
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 19:06:16 2008 +0200
build: combine the cleanlibfoo targets to one cleanlibs target
And use that in make clean
Michael
commit 1bb2b576a4fb546f51f1ad70ba8e8b3a86bff2c2
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 17:32:18 2008 +0200
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
commit 35b2ee2bce93f6e659f95d91b0590edd02c9b348
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 16:24:17 2008 +0200
build: remove the SONAME_VER variable - not used anymore.
Michael
commit 5712062d22237768a671aa918e39a22d290b0f0a
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 18:12:02 2008 +0200
build: fix typo in use of cleanlibsmbclient target
Michael
commit 39a447a232d0afbef55437a995f557553cbc8a0e
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 14:04:32 2008 +0200
build: add a cleanlibaddns target and use it in "make clean"
Michael
commit bbf665ad5790e89ff01867e2762fe2b94db7277d
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 13:57:34 2008 +0200
build: handle libaddns by SMB_LIBRARY() and correctly create SONAME file.
Create .so file as a symlink.
Michael
commit af971f79c7d736eb5b7ae8fcd4b2bf7ccf4834f3
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 13:55:31 2008 +0200
build: extend SMB_LIBRARY() to optionally take default value.
The default value defaults to "yes".
If no is specified, an optional third argument contains the
reason why building of the shared library is turned off by default.
Michael
commit b871cb0cb6d32e5e97666bd429d0fb9940ae4b2e
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 18:28:53 2008 +0200
build: move LIBADDNS_OBJ0 up again -- needed for NET_OBJ :-\
Michael
commit 61157cb92ec2c12e565fb088170c7f430e3b5b77
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 11:59:10 2008 +0200
build: move libaddns related bits to the libaddns section in Makefile.in
Michael
commit 20a5053f0e75176e9ec1d4fd5a18626bbe3a0267
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 09:26:21 2008 +0200
build: create cleanlibsmbsharemodes target and use it in "make clean".
Michael
commit 1157048146084e9ab34d7c2e77e8d00b22df53a4
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:41:23 2008 +0200
build: handle libsmbsharemodes by SMB_LIBRARY() and correctly create SONAME file.
Create libsmbsharemodes.so as a symlink.
Michael
commit 278dde8a6c486505c2d7403103ba011e1abb039e
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:23:57 2008 +0200
build: move libsmbsharemodes related vars and targets to libsmbsharemodes section in Makefile.in
Michael
commit 879b000fd3ad123f64017071a6aaa17cdc926995
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:20:47 2008 +0200
build: add structuring comment for libbigballofmud
commit 95a7d21d3150ca9c24d48cf6a2976dcc1dfaaa05
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:06:28 2008 +0200
build: add cleanlibsmbclient target and use it in make clean.
Michael
commit c463bd0cb9927176eec89e25788c6ea78eafdd16
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 00:02:50 2008 +0200
build: handle libsmbclient by SMB_LIBRARY() and correctly create soname file.
Create libsmbclient.so as a symlink to libsmbclient.so.0.
Michael
commit f440538c9480134ff05cf9c9f78a565808161101
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 23:37:06 2008 +0200
build: slightly change and extend the logic of SMB_LIBRARY().
Only call the install/uninstall targets (from make (un)install)
for libraries configured with SMB_LIBRARY(), when the user did
not set --with-libname=no.
Make sure to always (at least) build the static version of the library.
Michael
commit 40ff40de5780fb17567b8d5ea75f5bb7f8d811c4
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 22:10:23 2008 +0200
build: rename (un)installclientlib to (un)installlibsmbclient
keeping old targets as aliases for backward compatibility
Michael
commit ed3c35d307456601ca00d88a5cc278d6604681e1
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 22:08:28 2008 +0200
build: move libsmbclient related variables and targets to libsmbclient section
Michael
commit 36c99a3cad3c938a874f9b9f37c2265045957099
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 21:27:18 2008 +0200
build: move definition of SHLIBS to libraries section
Michael
commit e01a1d8d651f680ca58b809dc569ff74592d53a9
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 21:23:11 2008 +0200
build: add a cleanlibwbclient target to Makefile.in and use it for make clean.
Michael
commit 2712dade9d6495f3dbb75876ec32d73f8bb93f9f
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 21:20:54 2008 +0200
build: add uninstalllibwbclient to Makefile.in and use it for uninstall
Michael
commit 922b136ada1c502edcbbb89e9cca155cd6ad376c
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 21:14:17 2008 +0200
build: fix the installlibwbclient target to use defined variables and install the symlink
Michael
commit beab1a31484836014aab5d2bcb38995435f6218b
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:48:00 2008 +0200
build: fix creation of libwbclient shared lib by crating soname file
and adding .so file as a symlink
Michael
commit 8f64706b095b9ca0e2a8f39cc3133bfd02f86158
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:44:27 2008 +0200
build: move libwbclient related target to libwbclient section in Makefile.in
Michael
commit f94b07f0c56928f890ffb1e2aca2c8bfcc954dd5
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:39:45 2008 +0200
build: move libtdb target further down following common schema like with libtalloc
Michael
commit 21b6164795344cea45161bc01828ec1127b5b6ab
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:38:03 2008 +0200
build: fix uninstalllibnetapi target - handle symlink libnetapi.so
and use the defined variables instead of hardcoded bits.
Also move the target into the libnetapi section (forgotten last time).
Michael
commit 59e7827e557c5096fb363051a4cf1835b2a53223
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:35:13 2008 +0200
build: fix installlibnetapi target - install symlink libnetapi.so (if appropriate)
Michael
commit ff62887a94a7dd6f09995c820db7d825828bacad
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:28:43 2008 +0200
build: add a cleanlibnetapi target and use it in make clean
Michael
commit d9af2f7ab6b839e8074a69ce5d1fe66548c08e52
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:25:16 2008 +0200
build: fix creation of the libnetapi shared lib: create soname library
and add the .so file as symlink
Michael
commit da29e1ce44d4f99b876259fbad892691e2c7d7e0
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 20:11:50 2008 +0200
build: move libnetapi related definitions and targets together into the libnetapi section.
in Makefile.in
Michael
commit c50c847f4b9772261f8011f32eec97d8244dccdd
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 14:43:12 2008 +0200
build: add an uninstalllibtdb target.
Michael
commit 5c090762f769b645c411333aef2085362bb2e6cb
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 14:42:30 2008 +0200
build: fix the installlibtdb target to install the soname file of libtdb.
and create the .so file as a symlink (if appropriate)
Michael
commit ebfe13b79b24791bd9c854ac2f239f02796da6bb
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 14:37:29 2008 +0200
build: create a cleanlibtdb target and use it in target clean.
Michael
commit 662d666b41b11ae70daf7422b1ced5f86209e608
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 14:32:36 2008 +0200
build: fix creation of the libtdb shared library.
Create the libtdb.so.1 file and create the .so file as the symlink.
Not vice versa.
Michael
commit a4de301af48f4e5b4898751e8836bdb434d047a6
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 13:07:54 2008 +0200
build: move libtdb related definitions and targets to libtdb section in Makefile.in
Michael
commit b330892f4b2f9f50fd192e37720217d15fedf1f0
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 13:02:40 2008 +0200
build: move all libtalloc related definitions into the libtalloc section in Makefile.in
Michael
commit 4092059ff0bbb638c937c3f2b977ad431d868331
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 12:53:21 2008 +0200
build: move top level targets for the libs into the corresponding sections in Makefile.in
Michael
commit 53cc6a3225c0c7baea4d8ea04eefc61283650434
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 12:51:04 2008 +0200
build: add more structuring comments to Makefile.in
for several shared libs and shared modules section
Michael
commit 3de000890447dd15962fbd6a9b1b3504b9bd1175
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 12:39:24 2008 +0200
build: add structuring comments for libraries and libtalloc section.
Michael
commit 52ccb52c8e42e748fcc05337849945ddc30d5efa
Author: Michael Adam <obnox at samba.org>
Date: Mon Jul 7 16:16:28 2008 +0200
build: fix installlibtalloc to not install symlink if the library is not there
Michael
commit 01b1e642d72ecccac5277b5f071aab8f6df04c0d
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:52:09 2008 +0200
build: move libtalloc related targets together.
Michael
commit 5d3c6c3c1c08747c521292ef09648ad528c2dca9
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:48:39 2008 +0200
build: add a cleanlibtalloc target.
Michael
commit 4b6ef6202cd9b6e1e8949c43d0c45c04d4b97438
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:40:19 2008 +0200
build: add an uninstalllibtalloc target
Michael
commit d913b1e7316e84c1430f9d577f49d3c3e4e7719b
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:32:09 2008 +0200
build: fix creation of link libtalloc.so on some systems.
ln -s -f seem to be unknown on some solaris versions (e.g.).
so if there is an old libtalloc.so around, this will fail.
use rm -f prior to creating the link to circumvent this.
Michael
commit 49919889892f258cc669b08417e7569e8f5efaf4
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:30:38 2008 +0200
build: fix the installlibtalloc target to install SONAME and \.so versions of shared lib.
Michael
commit 946537e6bec904d4a7937eeb6085dfac19c3e2b5
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:29:02 2008 +0200
build: fix creation of talloc shared lib.
link the libtalloc.so.1 file and create libtalloc.so as a link
Michael
commit b8d13f8773f61863b71bfc9df468f0018b0db0d1
Author: Michael Adam <obnox at samba.org>
Date: Sun Jul 6 02:26:57 2008 +0200
build: add ability to use library files of the form NAME.so.VERSION to create version script name.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 667 ++++++++++++++++++++++++++++++--------------
source/configure.in | 154 ++---------
source/library-versions.in | 11 -
source/m4/aclocal.m4 | 62 ++++-
4 files changed, 532 insertions(+), 362 deletions(-)
delete mode 100644 source/library-versions.in
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index cbd34af..b4264de 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -25,9 +25,8 @@ SHLD=@SHLD@
LIB_PATH_VAR=@LIB_PATH_VAR@
## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@$$/@SYMSEXT@/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\+\)\?$$/@SYMSEXT@/'`
DSO_EXPORTS=@DSO_EXPORTS@
-SONAME_VER=`grep \^$@ $(builddir)/library-versions | cut -d: -f2`
SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
# The MODULE_EXPORTS variable contains the platform-specific linker flags
@@ -143,34 +142,6 @@ CODEPAGEDIR = @codepagedir@
# the directory where pid files go
PIDDIR = @piddir@
-LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
-LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
-LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@
-LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
-LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
-
-LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
-LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
-LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@
-LIBTDB_SYMS=$(srcdir)/exports/libtdb. at SYMSEXT@
-LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
-
-LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
-LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@
-LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@
-
-LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
-LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@
-LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
-LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient. at SYMSEXT@
-LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h
-
-LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
-LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@
-LIBNETAPI=$(LIBNETAPI_STATIC_TARGET) @LIBNETAPI_SHARED@
-LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi. at SYMSEXT@
-LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
-
FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS)
FLAGS2 =
FLAGS3 =
@@ -228,8 +199,6 @@ EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
bin/log2pcap at EXEEXT@ bin/sharesec at EXEEXT@ bin/ndrdump at EXEEXT@ \
bin/vlp at EXEEXT@ bin/smbiconv at EXEEXT@
-SHLIBS = libtalloc libtdb @LIBWBCLIENT@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBADDNS@ libnetapi
-
PAM_MODULES = @PAM_MODULES@
NSS_MODULES = @NSS_MODULES@
@@ -252,9 +221,6 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
# object file lists
######################################################################
-LIBTDB_OBJ0 = @TDB_OBJS@
-LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
-
TDB_OBJ = lib/util_tdb.o \
lib/dbwrap.o lib/dbwrap_tdb.o \
lib/dbwrap_tdb2.o lib/dbwrap_ctdb.o \
@@ -328,12 +294,6 @@ LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
-TALLOC_OBJ = @TALLOC_OBJS@
-
-
-LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
-LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
-
LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \
$(LIBREPLACE_OBJ) \
$(SOCKET_WRAPPER_OBJ) \
@@ -384,17 +344,6 @@ KRBCLIENT_OBJ = libads/kerberos.o libads/ads_status.o
LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \
libaddns/dnsgss.o libaddns/dnsmarshall.o
-LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@
-
-LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \
- nsswitch/libwbclient/wbc_util.o \
- nsswitch/libwbclient/wbc_pwd.o \
- nsswitch/libwbclient/wbc_idmap.o \
- nsswitch/libwbclient/wbc_sid.o \
- nsswitch/libwbclient/wbc_pam.o
-LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
- $(WBCOMMON_OBJ) \
- @LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ)
GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@
@@ -790,7 +739,7 @@ PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) @LIB
$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \
$(LDB_OBJ)
-SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ0) @LIBWBCLIENT_STATIC@
+SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
DISPLAY_SEC_OBJ= lib/display_sec.o
@@ -814,28 +763,6 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
$(LIBREPLACE_OBJ) @BUILD_INIPARSER@
-LIBSMBCLIENT_OBJ0 = \
- libsmb/libsmb_cache.o \
- libsmb/libsmb_compat.o \
- libsmb/libsmb_context.o \
- libsmb/libsmb_dir.o \
- libsmb/libsmb_file.o \
- libsmb/libsmb_misc.o \
- libsmb/libsmb_path.o \
- libsmb/libsmb_printjob.o \
- libsmb/libsmb_server.o \
- libsmb/libsmb_stat.o \
- libsmb/libsmb_xattr.o \
- libsmb/libsmb_setget.o \
- $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
- $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
-
-LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ0) @LIBWBCLIENT_STATIC@
-
-LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o @LIBTDB_STATIC@
-
# This shared library is intended for linking with unit test programs
# to test Samba internals. It's called libbigballofmud.so to
# discourage casual usage.
@@ -858,27 +785,6 @@ CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
$(DISPLAY_SEC_OBJ)
-LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
- lib/netapi/cm.o \
- librpc/gen_ndr/ndr_libnetapi.o \
- lib/netapi/libnetapi.o \
- lib/netapi/joindomain.o \
- lib/netapi/serverinfo.o \
- lib/netapi/getdc.o \
- lib/netapi/user.o \
- lib/netapi/group.o \
- lib/netapi/localgroup.o \
- lib/netapi/samr.o
-
-LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
- $(LIBSMBCONF_OBJ) \
- $(REG_SMBCONF_OBJ) \
- $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
- $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ)
-
LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \
lib/smbconf/smbconf_reg.o \
lib/smbconf/smbconf_txt.o \
@@ -1175,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)
@@ -1404,10 +1310,10 @@ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
-bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) \
- -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ0) $(KRB5LIBS) \
+ -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
$(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBWBCLIENT_SHARED@ \
@LIBTDB_LIBS@
@@ -1603,93 +1509,512 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIB
$(LIBS) @POPTLIBS@ $(LDAP_LIBS) \
@LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@
+
+#####################################################################
+#
+# libraries
+#
+#####################################################################
+
MKSYMS_SH = $(srcdir)/script/mksyms.sh
+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)
+
+cleanlibs:: cleanlibtalloc \
+ cleanlibtdb \
+ cleanlibnetapi \
+ cleanlibwbclient \
+ cleanlibsmbclient \
+ cleanlibsmbsharemodes \
+ cleanlibaddns
+
+
+#-------------------------------------------------------------------
+#
+# libtalloc
+#
+#-------------------------------------------------------------------
+
+TALLOC_OBJ = @TALLOC_OBJS@
+
+LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
+LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
+
+LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
+LIBTALLOC_SOVER=@LIBTALLOC_SOVER@
+LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER)
+LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
+LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@
+LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
+LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
+
$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
@$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
-$(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
+$(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
@echo Linking shared library $@
- @$(SHLD_DSO) $(LIBTALLOC_OBJ) \
- @SONAMEFLAG@`basename $@`.$(SONAME_VER)
- @ln -s -f `basename $@` $@.$(SONAME_VER)
+ @$(SHLD_DSO) $(LIBTALLOC_OBJ) @SONAMEFLAG@`basename $@`
+
+$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
+ @rm -f $@
+ @ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
$(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
@echo Linking non-shared library $@
@-$(AR) -rc $@ $(LIBTALLOC_OBJ0)
+libtalloc: $(LIBTALLOC)
+
+cleanlibtalloc::
+ -rm -f \
+ $(LIBTALLOC_SYMS) \
+ $(LIBTALLOC_STATIC_TARGET) \
+ $(LIBTALLOC_SHARED_TARGET) \
+ $(LIBTALLOC_SHARED_TARGET_SONAME)
+
+installlibtalloc:: installdirs libtalloc
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+ -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+ @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
+ -if test -e $(LIBTALLOC_SHARD_TARGET_SONAME) ; then \
+ ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
+ $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
+ fi
+ -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include
+
+uninstalllibtalloc::
+ -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
+ -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
+ -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)`
+ -rm -f $(DESTDIR)${prefix}/include/talloc.h
+
+
+#-------------------------------------------------------------------
+#
+# libtdb
+#
+#-------------------------------------------------------------------
+
+LIBTDB_OBJ0 = @TDB_OBJS@
+LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
+
+LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
+LIBTDB_SOVER=@LIBTDB_SOVER@
+LIBTDB_SHARED_TARGET_SONAME=$(LIBTDB_SHARED_TARGET).$(LIBTDB_SOVER)
+LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
+LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@
+LIBTDB_SYMS=$(srcdir)/exports/libtdb. at SYMSEXT@
+LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
+
$(LIBTDB_SYMS): $(LIBTDB_HEADERS)
@$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS)
-$(LIBTDB_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
+$(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBTDB_OBJ) \
- @SONAMEFLAG@`basename $@`.$(SONAME_VER)
- @ln -s -f `basename $@` $@.$(SONAME_VER)
+ @SONAMEFLAG@`basename $@`
+
+$(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
+ @rm -f $@
+ @ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
$(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
@echo Linking non-shared library $@
@-$(AR) -rc $@ $(LIBTDB_OBJ0)
+libtdb: $(LIBTDB)
+
+cleanlibtdb::
+ -rm -f \
+ $(LIBTDB_SYMS) \
+ $(LIBTDB_STATIC_TARGET) \
+ $(LIBTDB_SHARED_TARGET) \
+ $(LIBTDB_SHARED_TARGET_SONAME)
+
+
+installlibtdb:: installdirs libtdb
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+ -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+ @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
+ -if test -e $(LIBTDB_SHARED_TARGET_SONAME) ; then \
+ ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
+ $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
+ fi
+ -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include
+
+uninstalllibtdb::
+ -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
+ -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)`
+ -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_STATIC_TARGET)`
+ -rm -f $(DESTDIR)${prefix}/include/tdb.h
+
+
+#-------------------------------------------------------------------
+#
+# libwbclient
+#
+#-------------------------------------------------------------------
+
+LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \
+ nsswitch/libwbclient/wbc_util.o \
+ nsswitch/libwbclient/wbc_pwd.o \
+ nsswitch/libwbclient/wbc_idmap.o \
+ nsswitch/libwbclient/wbc_sid.o \
+ nsswitch/libwbclient/wbc_pam.o
+LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
+ $(WBCOMMON_OBJ) \
+ @LIBTALLOC_STATIC@ $(LIBREPLACE_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=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
+LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient. at SYMSEXT@
+LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h
+
$(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
@$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS)
-$(LIBWBCLIENT_SHARED_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_SHARED@
+$(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_SHARED@
@echo Linking shared library $@
@$(SHLD_DSO) @LIBTALLOC_LIBS@ $(LIBWBCLIENT_OBJ) \
- @SONAMEFLAG@`basename $@`.$(SONAME_VER)
- @ln -s -f `basename $@` $@.$(SONAME_VER)
+ @SONAMEFLAG@`basename $@`
+
+$(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
+ @rm -f $@
+ @ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
$(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
@echo Linking non-shared library $@
@-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
-bin/libaddns. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_SHARED@
+libwbclient: $(LIBWBCLIENT)
+
+cleanlibwbclient::
+ -rm -f \
+ $(LIBWBCLIENT_SYMS) \
+ $(LIBWBCLIENT_STATIC_TARGET) \
+ $(LIBWBCLIENT_SHARED_TARGET) \
+ $(LIBWBCLIENT_SHARED_TARGET_SONAME)
+
+installlibwbclient:: installdirs libwbclient
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+ -$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+ @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
+ -if test -e $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
+ ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
+ $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
+ fi
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBWBCLIENT_HEADERS) $(DESTDIR)${prefix}/include
+
+uninstalllibwbclient::
+ -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
+ -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)`
+ -rm -f $(DESTDIR)${prefix}/include/wbclient.h
+
+
+#-------------------------------------------------------------------
+#
+# libaddns
+#
+#-------------------------------------------------------------------
+
+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@
+
+LIBADDNS_SHARED_TARGET=@LIBADDNS_SHARED_TARGET@
+LIBADDNS_SOVER=@LIBADDNS_SOVER@
+LIBADDNS_SHARED_TARGET_SONAME=$(LIBADDNS_SHARED_TARGET).$(LIBADDNS_SOVER)
+LIBADDNS_STATIC_TARGET=@LIBADDNS_STATIC_TARGET@
+LIBADDNS=$(LIBADDNS_STATIC_TARGET) @LIBADDNS_SHARED@
+#LIBADDNS_SYMS=$(srcdir)/exports/libaddns. at SYMSEXT@
+LIBADDNS_HEADERS=$(srcdir)/libaddns/addns.h
+
+$(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_SHARED@
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \
$(KRB5LIBS) $(UUID_LIBS) @LIBTALLOC_LIBS@ \
- @SONAMEFLAG@`basename $@`.$(SONAME_VER)
+ @SONAMEFLAG@`basename $@`
+
+$(LIBADDNS_SHARED_TARGET): $(LIBADDNS_SHARED_TARGET_SONAME)
+ @rm -f $@
+ @ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
-bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
+$(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
@echo Linking non-shared library $@
- @-$(AR) -rc $@ $(LIBADDNS_OBJ)
+ @-$(AR) -rc $@ $(LIBADDNS_OBJ0)
+
+libaddns: $(LIBADDNS)
+
+cleanlibaddns::
+ -rm -f \
+ $(LIBADDNS_SHARED_TARGET) \
+ $(LIBADDNS_SHARED_TARGET_SONAME) \
+ $(LIBADDNS_STATIC_TARGET)
+
+installlibaddns:: installdirs libaddns
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+ -$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+ @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
+ -if test -e $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
+ ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
+ $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
+ fi
+ -$(INSTALLLIBCMD_A) $(LIBADDNS_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+
+uninstalllibaddns::
+ -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET_SONAME)`
+ -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
+ -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_STATIC_TARGET)`
+
+
+#-------------------------------------------------------------------
+#
+# libnetapi
+#
+#-------------------------------------------------------------------
+
+LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
+ lib/netapi/cm.o \
+ librpc/gen_ndr/ndr_libnetapi.o \
+ lib/netapi/libnetapi.o \
+ lib/netapi/joindomain.o \
+ lib/netapi/serverinfo.o \
+ lib/netapi/getdc.o \
+ lib/netapi/user.o \
+ lib/netapi/group.o \
+ lib/netapi/localgroup.o \
+ lib/netapi/samr.o
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list