[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2905-g216623b

Michael Adam obnox at samba.org
Thu Aug 14 14:10:50 GMT 2008


The branch, v3-2-test has been updated
       via  216623bb706f6b9ca9195829b9f9a8ab8485c44d (commit)
       via  bf267c57440b0bfedddb8e4d17dc1f23b758cd50 (commit)
       via  71e3a41c8e92e196130e5b4514f1014cf0549bf8 (commit)
       via  d10eba03ec5b624d364f9b0210cdaf6fddb9fd19 (commit)
       via  cdc5b3ca7aea71812d8c4d51b088b0aa3ce85b68 (commit)
       via  de7c35a8ab9701144d014199d156330cf6c1948f (commit)
       via  bec1046d54c6368ad7bc2171c27b4d39bdf369b4 (commit)
       via  69203d903833d7e1308c8d5f16f1046b52a26097 (commit)
       via  75822b4bd7ef61d52ef7900800af5106f942350a (commit)
       via  67834235eb62f16bf366668760f628a67c330c12 (commit)
       via  40c1092a305f3825fbf3362346ebbfcde562d0aa (commit)
       via  5c95eb75391290dd6d9fcb0cba23c4f4756b151c (commit)
       via  5dab57c61853163cb8f4a6a1887f748096be175c (commit)
       via  9e65aea4a2a906933126f69e80dac914972f27f9 (commit)
       via  19689e27d48c8cf4cd2a1e8fb800a38a4a910c99 (commit)
       via  5591d9c86e235b191065f989499d2d14a61b1606 (commit)
       via  21595a0a269ef7f3c3428cb41f45c3d1bd1fb661 (commit)
       via  2afd72288c54c4a0251cee4c99710bd894cf2b3f (commit)
       via  f61d00d18bda40d2736b45d1caf238ed42140e2e (commit)
       via  68aa96ff700feb43fd429c650ff6012a27bc445d (commit)
       via  92e0a9c1b71eda9cc8681e4b28f06431568aaf05 (commit)
       via  288c4951a102e313a86b461dcd5cf3e7840d65f2 (commit)
       via  6a6b90f4c56f040d19c60122c914b7a7ce64a3c6 (commit)
       via  e2624c2537e87acad7cfd58c76cb471d7141801c (commit)
       via  4266976d0f35161af8a8c687589c6010de3035a3 (commit)
       via  196cf8307291aafb65db6291f3c55fdd33a2de85 (commit)
       via  961bb257b590920b7fbcf80bbe26c58a6b4be696 (commit)
       via  f474363356a965fe712cb2dc4afa3272b2f882cb (commit)
       via  90e56e6b86b3aee208ff326246aaf7dfad1ee0ce (commit)
       via  f0ee69d25da86647a4a75e6994e72a62ad889064 (commit)
       via  6c11ed560ae20f712be6c0680f53b1a275da94e7 (commit)
       via  2344a61abc83e26bf7488a1de00289937af4f758 (commit)
       via  a1132b9cf92a16448888e7b64e08efd796677db6 (commit)
       via  0ae8cc06532a72ab68ce91d6237d5457dfe369fd (commit)
       via  8335245d9164f0bd19b2d018bb3138fde9e05fa7 (commit)
       via  ace76729b45730c70915c2656eee5ed83102bcf6 (commit)
       via  fc3dafec9fc6b064de1909ae53099b07100fe1b4 (commit)
       via  db2a20d834e7ede4a1c97aeb075d6b55afb1c847 (commit)
       via  706c66f0d893d97646898e7bd69a45db9411ff65 (commit)
       via  2f10a7f631452993a942f2fd7362ebe3bad3859f (commit)
       via  7879c44a695a1b2817f312ba1e276847406b3209 (commit)
       via  06dfae9a67ccb40bd14192505d26ab4e7870e7c5 (commit)
       via  96fac8a57a009e1bcf66c04a11fa78e0e4718db8 (commit)
       via  168a5a4c131e7993d89fb4391e254befe8e03d67 (commit)
       via  3fd4ef99f7a41de203dc5cc7c802bdbf4562efdb (commit)
       via  b3a0602cc47c2f3d452c42a475a3103899802729 (commit)
       via  ae6adbf863e7662af41e971341ae7e96a346b765 (commit)
       via  c72a795bfaade8dd6117384806619f54bc442132 (commit)
       via  360b81ff6e83457cfaf1d122bdc6b301ce7f6630 (commit)
       via  7c9e741b2431f1235606ccdf462d1bf3d15049b3 (commit)
       via  88d7bdacff4a8354c172b781d217c75c983ace7a (commit)
       via  f76a628db01f58e50609f1cff05649778a35a916 (commit)
       via  0b34e6d2e2e076e46e7aa6e96543ef183764c720 (commit)
       via  3c8389f80b6194219f18219520269281b458ce15 (commit)
       via  8a728f74586111b0415c746da3b75f5bb2f7021e (commit)
       via  61e32e9255fd06ecaabc3b27a6d7dc254a7cb521 (commit)
       via  69fafff2626841ce5e3832f9a96b78f2a2ed6d33 (commit)
       via  e60e337807c5bb95268aadaf68e619cb6262f8e9 (commit)
       via  f6e5e3a98d6426052150ef35c6ddccac1367bcf9 (commit)
       via  3ae8e1ca573f19ecbdcb1a5fbc64fac22671a6aa (commit)
       via  ba6a10f28f5161f725fff929df6fb8a4fa81b061 (commit)
       via  ed8622ea9d58620bd5319e5cd5c32ebf7838d6fb (commit)
       via  f471bcda42f4d504830989f9c69382075c701b39 (commit)
       via  e4a7abb5f978475493c8c1d10dd078b778a857bf (commit)
       via  cf7c21409bce6fc39cf62ced54191e7a78ea470b (commit)
       via  e278895d41780ba7022a085229d2b0482be5f0ea (commit)
       via  d3c483ffac09498fc0ebe23b7c9b890586849597 (commit)
       via  25852c3df675cdbbac07d919cb5c088b7146d1ef (commit)
       via  1fc6b24ac85aee70802d88a9f8280776a0beb3ca (commit)
       via  2ae7ab1640b8f8da8c74be5e88480bd3293a4dbf (commit)
       via  dfd2262ca469e7e409e0061ed62c14ac72d5440a (commit)
       via  d0fa43966e5486512e04bd28cf84f24896d035d1 (commit)
       via  8a2c96bd92e2090a7542709819b2f478247da6da (commit)
       via  ddf6b352fe79e3118e20b50e0f0a981dc44634a9 (commit)
       via  e5b3718913f52afe7df3b0e017451d9ece330191 (commit)
       via  387707e4e48ebcaf1951d440362c301495903946 (commit)
       via  b5ccce5db2f034dbeade68d97f55d973db241321 (commit)
       via  512cf07187c33f17e1724d345fffb4f813fa8768 (commit)
       via  9509bfbbb0581d71d15110aa8192c00ef3a89c40 (commit)
       via  76cfd3116a0d30301bdb1e728debe615e6caddc3 (commit)
       via  22e28489a7ae01bb7adc994008e6b062b2d74a66 (commit)
       via  1cf4d4aaa4bcec2dcc7b99288f4818b0535fdfad (commit)
       via  03f8b71417188e363d04eacff0904b693a06b339 (commit)
       via  f75a3ff33255ba3cc12535f1c0405c0a0b2ca410 (commit)
       via  3b221c60cc92dfaa7ca7c45b1ee3d8efa0e15197 (commit)
       via  df52ff62eb890fd645b1c955d72f4bec90851929 (commit)
       via  8fd80452ec71b621adb48b735229f6214dfca85e (commit)
      from  77c25837addde31086151ce174dcbf463b2569f0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 216623bb706f6b9ca9195829b9f9a8ab8485c44d
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 18:09:06 2008 +0200

    build: use $(PAM_WINBIND_EXTRA_LIBS) instead of @PAM_WINBIND_EXTRA_LIBS@ in rules.
    
    Eliminate more potential traps for picky makes.
    
    Michael
    (cherry picked from commit 8897aaec32ef7cb4dab37a70754c8596409fed00)

commit bf267c57440b0bfedddb8e4d17dc1f23b758cd50
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 18:08:31 2008 +0200

    build: use $(WINBIND_NSS_PTHREAD) instead of @WINBIND_NSS_PTHREAD@ in rules.
    
    Eliminate more potential traps for picky makes.
    
    Michael
    (cherry picked from commit bf619d019225a7aaf17e213e65c5734e68094142)

commit 71e3a41c8e92e196130e5b4514f1014cf0549bf8
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 18:07:27 2008 +0200

    build: use $(WINBIND_NSS_EXTRA_LIBS) instead of @WINBIND_NSS_EXTRA_LIBS@ in rules.
    
    Eliminate more potential traps for picky makes.
    
    Michael
    (cherry picked from commit 603b83c980a73e13f7dad35a28830105358c7544)

commit d10eba03ec5b624d364f9b0210cdaf6fddb9fd19
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 18:06:39 2008 +0200

    build: use $(LDAP_LIBS) instead of @LDAP_LIBS@ in rules.
    
    Eliminate more potential traps for picky makes.
    
    Michael
    (cherry picked from commit 1f0feb3d12aa93400e8ba604df36a00d7cfaa07a)

commit cdc5b3ca7aea71812d8c4d51b088b0aa3ce85b68
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 18:06:05 2008 +0200

    build: use $(LIBNETAPI_LIBS) instead of @LIBNETAPI_LIBS@ in rules.
    
    Eliminate more potential traps for picky makes.
    
    Michael
    (cherry picked from commit cd3c667bdaa8c2b09debbfd8c3389cf9f6d690e9)

commit de7c35a8ab9701144d014199d156330cf6c1948f
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 18:04:53 2008 +0200

    build: link in $(WINBIND_LIBS) instead of @LIBWBCLIENT_SHARED@
    
    This should fix some more picky makes when not building @LIBWBCLINET_SHARED@
    Moreover, we want to link against -lwbclient, not against bin/libwbclient.so
    anyways.
    
    Michael
    (cherry picked from commit 73582e4c5168301696cdca569167402f17a67218)

commit bec1046d54c6368ad7bc2171c27b4d39bdf369b4
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 18:02:08 2008 +0200

    build: use $(LIBTDB_LIBS) instead of @LIBTDB_LIBS@ in rules.
    
    Eliminate more potential traps for picky makes.
    
    Michael
    (cherry picked from commit 4330a2ab1308bd2b1508d5126146742540219520)

commit 69203d903833d7e1308c8d5f16f1046b52a26097
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 18:00:50 2008 +0200

    build: use $(LIBTALLOC_LIBS) instead of @LIBTALLOC_LIBS@ in rules.
    
    Eliminate more potential traps for picky makes.
    
    Michael
    
    (cherry picked from commit 1719fd3ccc110b90908410c07aee862a8758e683)
    
    conflicts resolved

commit 75822b4bd7ef61d52ef7900800af5106f942350a
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 17:58:53 2008 +0200

    build: use $(POPT_LIBS) instad of @POPT_LIBS@ in rules.
    
    Eliminate more potential traps for picky makes.
    
    Michael
    (cherry picked from commit 87f56f28800d2045e70739a8edcd359ddee662a7)

commit 67834235eb62f16bf366668760f628a67c330c12
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 14 17:55:48 2008 +0200

    build: use $(WINBIND_LIBS) instead of @WINBIND_LIBS@ in rules.
    
    This fixes the build on systems with picky make, where
    libwbclient is not built as a shared library, since the
    expansion of @WINBIND_LIBS@ will result in an empty line
    in the rule with just the leading tabs/spaces.
    
    Michael
    
    (cherry picked from commit aff6822c3ab3ea46d928570f03f681f53ccf3d50)
    
    conflicts resolved

commit 40c1092a305f3825fbf3362346ebbfcde562d0aa
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 10 16:25:21 2008 +0200

    build: remove SHLIBS variable, and distribute deps for shlibs and test_shlibs target
    
    Michael
    (cherry picked from commit 939e75126ebfcd9124781b5d70a68886c4bf9a54)

commit 5c95eb75391290dd6d9fcb0cba23c4f4756b151c
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 10 15:51:14 2008 +0200

    build: create a new uninstalllibs target and use it in "make uninstall"
    
    Michael
    (cherry picked from commit 73a3e4e1eaa408ef0ddbbb8aa0113fdc869057bb)

commit 5dab57c61853163cb8f4a6a1887f748096be175c
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 10 15:49:44 2008 +0200

    build: distribute the libs target over the library-specific sections.
    
    Michael
    (cherry picked from commit 18b932c980f2acdf9b5569cf61afece28c02abf5)

commit 9e65aea4a2a906933126f69e80dac914972f27f9
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 10 15:01:56 2008 +0200

    build: use the libs target instead of the LIBRARIES variable as dependecy for "all".
    
    Michael
    (cherry picked from commit 991c3fefa850c0b48111c6c5bacae14163872b58)

commit 19689e27d48c8cf4cd2a1e8fb800a38a4a910c99
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 10 14:58:36 2008 +0200

    build: distribute the cleanlibs target over the library-specific sections.
    
    Michael
    (cherry picked from commit 2588c399a0df99a87cf7c749133bceb6aa34a21a)

commit 5591d9c86e235b191065f989499d2d14a61b1606
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 10 14:15:39 2008 +0200

    build: introduce a installibs target and use it in "make install"
    
    The target is distributed over the library-specific sections.
    
    Michael
    (cherry picked from commit 0afe205a7da4103a4fcfdd24f45a164493e3b9b8)

commit 21595a0a269ef7f3c3428cb41f45c3d1bd1fb661
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 8 17:00:07 2008 +0200

    build: move definition of LIBADDNS_OBJ back up to LIBADDNS_OBJ0
    
    to keep stuff together...
    
    Michael
    (cherry picked from commit 22735ee14a244dbda768c26dbe83a1b2aa3c03ec)

commit 2afd72288c54c4a0251cee4c99710bd894cf2b3f
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 8 16:55:52 2008 +0200

    build: fix build of smbget by moving LIBSMBCLIENT_OBJ* defs up again
    
    to their original place. The problem was that LIBSMCLIENT_OBJ1 is used
    in SMBGET_OBJ and that the difinition of LIBSMBCLIENT_OBJ1 was moved
    below the bin/smbget target. Somehow it had worked for me.
    
    Thanks to Derrell for pointing that out.
    
    Michael
    (cherry picked from commit c4e51f5e761ab23fa08197fa9a52af6db4ab839d)

commit f61d00d18bda40d2736b45d1caf238ed42140e2e
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
    (cherry picked from commit bae7bd4bba4d49edec9cb58d47c1cb82aba16c6b)

commit 68aa96ff700feb43fd429c650ff6012a27bc445d
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
    (cherry picked from commit 4d6edcb2c8bd516e09a864d1990675ba9bcec796)

commit 92e0a9c1b71eda9cc8681e4b28f06431568aaf05
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
    (cherry picked from commit 76f9e2e64644c6f21baf523b91455dc3aebb2163)

commit 288c4951a102e313a86b461dcd5cf3e7840d65f2
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
    (cherry picked from commit e2699b7f86302e5c770f8e3160f72f070d700b6c)

commit 6a6b90f4c56f040d19c60122c914b7a7ce64a3c6
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
    (cherry picked from commit 3c300f9f8cffb5af32e291ec75007ab98fe96561)

commit e2624c2537e87acad7cfd58c76cb471d7141801c
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
    (cherry picked from commit d9d92b64275127e29c80dbdc7cfe193289fef9a3)

commit 4266976d0f35161af8a8c687589c6010de3035a3
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
    
    (cherry picked from commit 887b6231198ce2ff6230e0939ddcf46759bc88bf)
    
    conflicts resolved

commit 196cf8307291aafb65db6291f3c55fdd33a2de85
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
    (cherry picked from commit 1bb2b576a4fb546f51f1ad70ba8e8b3a86bff2c2)

commit 961bb257b590920b7fbcf80bbe26c58a6b4be696
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
    (cherry picked from commit 35b2ee2bce93f6e659f95d91b0590edd02c9b348)

commit f474363356a965fe712cb2dc4afa3272b2f882cb
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
    
    (cherry picked from commit 5712062d22237768a671aa918e39a22d290b0f0a)
    
    conflicts resolved

commit 90e56e6b86b3aee208ff326246aaf7dfad1ee0ce
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
    
    (cherry picked from commit 39a447a232d0afbef55437a995f557553cbc8a0e)
    
    conflicts resolved
    
    Michael

commit f0ee69d25da86647a4a75e6994e72a62ad889064
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
    (cherry picked from commit bbf665ad5790e89ff01867e2762fe2b94db7277d)

commit 6c11ed560ae20f712be6c0680f53b1a275da94e7
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
    (cherry picked from commit af971f79c7d736eb5b7ae8fcd4b2bf7ccf4834f3)

commit 2344a61abc83e26bf7488a1de00289937af4f758
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
    
    (cherry picked from commit b871cb0cb6d32e5e97666bd429d0fb9940ae4b2e)
    
    conflicts resolved

commit a1132b9cf92a16448888e7b64e08efd796677db6
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
    
    (cherry picked from commit 61157cb92ec2c12e565fb088170c7f430e3b5b77)
    
    conflicts resolved

commit 0ae8cc06532a72ab68ce91d6237d5457dfe369fd
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
    
    (cherry picked from commit 20a5053f0e75176e9ec1d4fd5a18626bbe3a0267)
    
    conflicts resolved

commit 8335245d9164f0bd19b2d018bb3138fde9e05fa7
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
    (cherry picked from commit 1157048146084e9ab34d7c2e77e8d00b22df53a4)

commit ace76729b45730c70915c2656eee5ed83102bcf6
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
    (cherry picked from commit 278dde8a6c486505c2d7403103ba011e1abb039e)

commit fc3dafec9fc6b064de1909ae53099b07100fe1b4
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 7 00:20:47 2008 +0200

    build: add structuring comment for libbigballofmud
    (cherry picked from commit 879b000fd3ad123f64017071a6aaa17cdc926995)

commit db2a20d834e7ede4a1c97aeb075d6b55afb1c847
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
    
    (cherry picked from commit 95a7d21d3150ca9c24d48cf6a2976dcc1dfaaa05)
    
    conflicts resolved

commit 706c66f0d893d97646898e7bd69a45db9411ff65
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
    (cherry picked from commit c463bd0cb9927176eec89e25788c6ea78eafdd16)

commit 2f10a7f631452993a942f2fd7362ebe3bad3859f
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
    (cherry picked from commit f440538c9480134ff05cf9c9f78a565808161101)

commit 7879c44a695a1b2817f312ba1e276847406b3209
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
    (cherry picked from commit 40ff40de5780fb17567b8d5ea75f5bb7f8d811c4)

commit 06dfae9a67ccb40bd14192505d26ab4e7870e7c5
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
    (cherry picked from commit ed3c35d307456601ca00d88a5cc278d6604681e1)

commit 96fac8a57a009e1bcf66c04a11fa78e0e4718db8
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
    (cherry picked from commit 36c99a3cad3c938a874f9b9f37c2265045957099)

commit 168a5a4c131e7993d89fb4391e254befe8e03d67
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
    
    (cherry picked from commit e01a1d8d651f680ca58b809dc569ff74592d53a9)
    
    conflicts resolved

commit 3fd4ef99f7a41de203dc5cc7c802bdbf4562efdb
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
    (cherry picked from commit 2712dade9d6495f3dbb75876ec32d73f8bb93f9f)

commit b3a0602cc47c2f3d452c42a475a3103899802729
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
    (cherry picked from commit 922b136ada1c502edcbbb89e9cca155cd6ad376c)

commit ae6adbf863e7662af41e971341ae7e96a346b765
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
    (cherry picked from commit beab1a31484836014aab5d2bcb38995435f6218b)

commit c72a795bfaade8dd6117384806619f54bc442132
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:44:30 2008 +0200

    Revert "build: fix creation of libsmbsharemodes.a - don't link in libtdb.a."
    
    This reverts commit 4fc57a0a90390ede1161fd6f231ea274c9c74b20.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later in upstream form.
    
    Michael

commit 360b81ff6e83457cfaf1d122bdc6b301ce7f6630
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:43:58 2008 +0200

    Revert "build: fix creation of libsmbclient.a - don't link in libtalloc.a"
    
    This reverts commit dcf986937ccf5e6947c4214aa0838733ed7f3b9b.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later in upstream form.
    
    Michael

commit 7c9e741b2431f1235606ccdf462d1bf3d15049b3
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:43:31 2008 +0200

    Revert "build: fix creation of libaddns.a - don't link in libtalloc.a"
    
    This reverts commit 396310775e69baeee06b2e6469854a5ddf759a91.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later in upstream form.
    
    Michael

commit 88d7bdacff4a8354c172b781d217c75c983ace7a
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:43:05 2008 +0200

    Revert "build: fix build on systems with picky make and without shared libwbclient"
    
    This reverts commit fd9b4bcaa5302d3d6245eb7b21ce0ef9994f718d.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit f76a628db01f58e50609f1cff05649778a35a916
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:42:49 2008 +0200

    Revert "build: use $(POPT_LIBS) instad of @POPT_LIBS@ in rules."
    
    This reverts commit 2d2b48749e885d2a529dab273c8419c5445568d3.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit 0b34e6d2e2e076e46e7aa6e96543ef183764c720
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:40:54 2008 +0200

    Revert "build: use $(LIBTALLOC_LIBS) instead of @LIBTALLOC_LIBS@ in rules."
    
    This reverts commit 15dd9f78650b0b853cb6955429ae58656be3945e.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit 3c8389f80b6194219f18219520269281b458ce15
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:40:37 2008 +0200

    Revert "build: use $(LIBTDB_LIBS) instead of @LIBTDB_LIBS@ in rules."
    
    This reverts commit 0f609e55d8c58285de73fa0955df951042dfd9a0.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit 8a728f74586111b0415c746da3b75f5bb2f7021e
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:40:11 2008 +0200

    Revert "build: link in $(WINBIND_LIBS) instead of @LIBWBCLIENT_SHARED@"
    
    This reverts commit a60d295d3ac4a6e7a055927951f7207f09a3df7c.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit 61e32e9255fd06ecaabc3b27a6d7dc254a7cb521
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:39:54 2008 +0200

    Revert "build: use $(LIBNETAPI_LIBS) instead of @LIBNETAPI_LIBS@ in rules."
    
    This reverts commit 22d0f686eb6649b3d4a8c7f142257e303c54568e.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit 69fafff2626841ce5e3832f9a96b78f2a2ed6d33
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:39:37 2008 +0200

    Revert "build: use $(LDAP_LIBS) instead of @LDAP_LIBS@ in rules."
    
    This reverts commit a7ee1c16c234ad5d0aa8853081d8f5f4f763614b.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit e60e337807c5bb95268aadaf68e619cb6262f8e9
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:39:20 2008 +0200

    Revert "build: use $(WINBIND_NSS_EXTRA_LIBS) instead of @WINBIND_NSS_EXTRA_LIBS@ in rules."
    
    This reverts commit 7420f409c2fbfd5f90d45a4a435489fe31016581.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit f6e5e3a98d6426052150ef35c6ddccac1367bcf9
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:38:59 2008 +0200

    Revert "build: use $(WINBIND_NSS_PTHREAD) instead of @WINBIND_NSS_PTHREAD@ in rules."
    
    This reverts commit 1aad6661adc5800243969b761c653b57ff280f69.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit 3ae8e1ca573f19ecbdcb1a5fbc64fac22671a6aa
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 14:38:02 2008 +0200

    Revert "build: use $(PAM_WINBIND_EXTRA_LIBS) instead of @PAM_WINBIND_EXTRA_LIBS@ in rules."
    
    This reverts commit 9a2870e936a967b82a100b1e26200d3665311f85.
    
    In preparation of picking libraray creation/install fixes.
    To be re-added later.
    
    Michael

commit ba6a10f28f5161f725fff929df6fb8a4fa81b061
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
    
    (cherry picked from commit 8f64706b095b9ca0e2a8f39cc3133bfd02f86158)
    
    resolved conflicts

commit ed8622ea9d58620bd5319e5cd5c32ebf7838d6fb
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
    (cherry picked from commit f94b07f0c56928f890ffb1e2aca2c8bfcc954dd5)

commit f471bcda42f4d504830989f9c69382075c701b39
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
    (cherry picked from commit 21b6164795344cea45161bc01828ec1127b5b6ab)

commit e4a7abb5f978475493c8c1d10dd078b778a857bf
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
    (cherry picked from commit 59e7827e557c5096fb363051a4cf1835b2a53223)

commit cf7c21409bce6fc39cf62ced54191e7a78ea470b
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
    
    (cherry picked from commit ff62887a94a7dd6f09995c820db7d825828bacad)
    
    resolved conflicts

commit e278895d41780ba7022a085229d2b0482be5f0ea
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
    (cherry picked from commit d9af2f7ab6b839e8074a69ce5d1fe66548c08e52)

commit d3c483ffac09498fc0ebe23b7c9b890586849597
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
    
    (cherry picked from commit da29e1ce44d4f99b876259fbad892691e2c7d7e0)
    
    resolved conflicts

commit 25852c3df675cdbbac07d919cb5c088b7146d1ef
Author: Michael Adam <obnox at samba.org>
Date:   Sun Jul 6 14:43:12 2008 +0200

    build: add an uninstalllibtdb target.
    
    Michael
    (cherry picked from commit c50c847f4b9772261f8011f32eec97d8244dccdd)

commit 1fc6b24ac85aee70802d88a9f8280776a0beb3ca
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
    (cherry picked from commit 5c090762f769b645c411333aef2085362bb2e6cb)

commit 2ae7ab1640b8f8da8c74be5e88480bd3293a4dbf
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
    
    (cherry picked from commit ebfe13b79b24791bd9c854ac2f239f02796da6bb)
    
    resolved conflicts

commit dfd2262ca469e7e409e0061ed62c14ac72d5440a
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
    (cherry picked from commit 662d666b41b11ae70daf7422b1ced5f86209e608)

commit d0fa43966e5486512e04bd28cf84f24896d035d1
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
    (cherry picked from commit a4de301af48f4e5b4898751e8836bdb434d047a6)

commit 8a2c96bd92e2090a7542709819b2f478247da6da
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
    (cherry picked from commit b330892f4b2f9f50fd192e37720217d15fedf1f0)

commit ddf6b352fe79e3118e20b50e0f0a981dc44634a9
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
    (cherry picked from commit 4092059ff0bbb638c937c3f2b977ad431d868331)

commit e5b3718913f52afe7df3b0e017451d9ece330191
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
    (cherry picked from commit 53cc6a3225c0c7baea4d8ea04eefc61283650434)

commit 387707e4e48ebcaf1951d440362c301495903946
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 23 13:42:40 2008 +0200

    build: add a "make shlibs" target to build all the shared libraries.
    
    Michael
    (cherry picked from commit 5a99f59d7514edadbab081dc0c5c28a6ea26972a)

commit b5ccce5db2f034dbeade68d97f55d973db241321
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
    (cherry picked from commit 3de000890447dd15962fbd6a9b1b3504b9bd1175)

commit 512cf07187c33f17e1724d345fffb4f813fa8768
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
    (cherry picked from commit 52ccb52c8e42e748fcc05337849945ddc30d5efa)

commit 9509bfbbb0581d71d15110aa8192c00ef3a89c40
Author: Michael Adam <obnox at samba.org>
Date:   Sun Jul 6 02:52:09 2008 +0200

    build: move libtalloc related targets together.
    
    Michael
    (cherry picked from commit 01b1e642d72ecccac5277b5f071aab8f6df04c0d)

commit 76cfd3116a0d30301bdb1e728debe615e6caddc3
Author: Michael Adam <obnox at samba.org>
Date:   Sun Jul 6 02:48:39 2008 +0200

    build: add a cleanlibtalloc target.
    
    Michael
    
    (cherry picked from commit 5d3c6c3c1c08747c521292ef09648ad528c2dca9)
    
    resolved conflicts

commit 22e28489a7ae01bb7adc994008e6b062b2d74a66
Author: Michael Adam <obnox at samba.org>
Date:   Sun Jul 6 02:40:19 2008 +0200

    build: add an uninstalllibtalloc target
    
    Michael
    (cherry picked from commit 4b6ef6202cd9b6e1e8949c43d0c45c04d4b97438)

commit 1cf4d4aaa4bcec2dcc7b99288f4818b0535fdfad
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
    (cherry picked from commit d913b1e7316e84c1430f9d577f49d3c3e4e7719b)

commit 03f8b71417188e363d04eacff0904b693a06b339
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
    (cherry picked from commit 49919889892f258cc669b08417e7569e8f5efaf4)

commit f75a3ff33255ba3cc12535f1c0405c0a0b2ca410
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
    (cherry picked from commit 946537e6bec904d4a7937eeb6085dfac19c3e2b5)

commit 3b221c60cc92dfaa7ca7c45b1ee3d8efa0e15197
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
    (cherry picked from commit b8d13f8773f61863b71bfc9df468f0018b0db0d1)

commit df52ff62eb890fd645b1c955d72f4bec90851929
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun May 18 18:39:48 2008 +0200

    Add double-colon where it makes sense.
    
    (cherry picked from commit 256200e951476ff31c95a7d5621a50ba297ea6e4)
    
    Conflicts resolved (obnox)

commit 8fd80452ec71b621adb48b735229f6214dfca85e
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 14 11:48:23 2008 +0200

    Revert "build: fix bug #5608: link creation for libtalloc.so.1 (and friends) on solaris 8"
    
    This reverts commit f4d26db5dfccb962f5ca2cc03e9012a9883e16d8.
    
    In preparation of the library cration / installation changes.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in         |  727 ++++++++++++++++++++++++++++++--------------
 source/configure.in        |  154 +---------
 source/library-versions.in |   11 -
 source/m4/aclocal.m4       |   62 ++++-
 4 files changed, 565 insertions(+), 389 deletions(-)
 delete mode 100644 source/library-versions.in


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 41753c5..f85185c 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
@@ -149,34 +148,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 =
@@ -234,8 +205,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@
@@ -256,9 +225,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 \
@@ -326,12 +292,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) \
@@ -385,17 +345,7 @@ 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) $(SOCKET_WRAPPER_OBJ) @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)
+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@
 
 LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \
 	      libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o
@@ -827,9 +777,6 @@ LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
 
 LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
 
-LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
-LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) @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.
@@ -851,24 +798,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
-
-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 \
@@ -1162,18 +1091,18 @@ VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
 ######################################################################
 # now the rules...
 ######################################################################
-all : SHOWFLAGS $(SHLIBS) $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
+all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
 	$(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
 
-nss_modules : $(NSS_MODULES)
+nss_modules:: $(NSS_MODULES)
 
-pam_modules : $(PAM_MODULES)
+pam_modules:: $(PAM_MODULES)
 
 pam_smbpass : SHOWFLAGS bin/pam_smbpass. at SHLIBEXT@
 
 pam_winbind : SHOWFLAGS bin/pam_winbind. at SHLIBEXT@
 
-torture : SHOWFLAGS $(TORTURE_PROGS)
+torture:: SHOWFLAGS $(TORTURE_PROGS)
 
 smbtorture : SHOWFLAGS bin/smbtorture at EXEEXT@
 
@@ -1211,7 +1140,7 @@ nsswitch : SHOWFLAGS bin/winbindd at EXEEXT@ bin/wbinfo at EXEEXT@ @WINBIND_NSS@ \
 
 wins : SHOWFLAGS @WINBIND_WINS_NSS@
 
-modules: SHOWFLAGS $(MODULES)
+modules:: SHOWFLAGS $(MODULES)
 
 #####################################################################
 ## Perl IDL Compiler
@@ -1220,7 +1149,7 @@ IDL_FILES = lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \
 	epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
 	dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl
 
-idl:
+idl::
 	@IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
 	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
 
@@ -1228,13 +1157,13 @@ idl:
 #####################################################################
 
 
-everything: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
+everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
 	$(EVERYTHING_PROGS)
 
 .SUFFIXES:
 .SUFFIXES: .c .o .lo
 
-SHOWFLAGS:
+SHOWFLAGS::
 	@echo "Using FLAGS      = $(FLAGS)"
 	@echo "      PICFLAG    = $(PICFLAG)"
 	@echo "      LIBS       = $(LIBS)"
@@ -1279,7 +1208,7 @@ PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
 
 # this adds support for precompiled headers. To use it, install a snapshot
 # of gcc-3.4 and run 'make pch' before you do the main build.
-pch: proto_exists
+pch:: proto_exists
 	rm -f $(PRECOMPILED_HEADER)
 	$(MAKE) $(PRECOMPILED_HEADER)
 
@@ -1589,98 +1518,501 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIB
 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
 
+
+#####################################################################
+#
+# libraries
+#
+#####################################################################
+
 MKSYMS_SH = $(srcdir)/script/mksyms.sh
 
+
+#-------------------------------------------------------------------
+#
+# 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)
-	@rm -f $@.$(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
+
+libs:: libtalloc
+installlibs:: @INSTALL_LIBTALLOC@
+uninstalllibs:: @UNINSTALL_LIBTALLOC@
+cleanlibs:: cleanlibtalloc
+shlibs test_shlibs: @LIBTALLOC_SHARED@
+
+#-------------------------------------------------------------------
+#
+# 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)
-	@rm -f $@.$(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
+
+libs:: libtdb
+installlibs:: @INSTALL_LIBTDB@
+uninstalllibs:: @UNINSTALL_LIBTDB@
+cleanlibs:: cleanlibtdb
+shlibs test_shlibs: @LIBTDB_SHARED@
+
+#-------------------------------------------------------------------
+#
+# 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)
-	@rm -f $@.$(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
+
+libs:: libwbclient
+installlibs:: @INSTALL_LIBWBCLIENT@
+uninstalllibs:: uninstalllibwbclient
+cleanlibs:: cleanlibwbclient
+shlibs test_shlibs: @LIBWBCLIENT_SHARED@
+
+
+#-------------------------------------------------------------------
+#
+# libaddns
+#
+#-------------------------------------------------------------------
+
+
+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_OBJ0)
+$(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
 	@echo Linking non-shared library $@
 	@-$(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)`
+
+libs:: libaddns
+installlibs:: @INSTALL_LIBADDNS@
+uninstalllibs:: @UNINSTALL_LIBADDNS@
+cleanlibs:: cleanlibaddns
+shlibs test_shlibs: @LIBADDNS_SHARED@
+
+#-------------------------------------------------------------------
+#
+# libnetapi
+#


-- 
Samba Shared Repository


More information about the samba-cvs mailing list