Author: jpeach
Date: 2007-04-20 16:07:16 +0000 (Fri, 20 Apr 2007)
New Revision: 22413

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22413

Log:
Simplify the build rules for plugin modules. Add support for per-platform
exports files. Fix the shared library build pf pdb_ldap.

Added:
   branches/SAMBA_3_0/source/modules/exports.darwin
Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in       2007-04-20 12:23:36 UTC (rev 
22412)
+++ branches/SAMBA_3_0/source/Makefile.in       2007-04-20 16:07:16 UTC (rev 
22413)
@@ -26,6 +26,11 @@
 [EMAIL PROTECTED]@ @LDFLAGS@
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@ @LDFLAGS@
+
+# The MODULE_EXPORTS variable conatins the platform-specific linker flags
+# needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules.
[EMAIL PROTECTED]@
+
 [EMAIL PROTECTED]@ @LDFLAGS@
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
@@ -1320,85 +1325,75 @@
 libmsrpc: $(LIBMSRPC)
 libaddns: $(LIBADDNS)
 
+# Linker command to link a RPC, VFS, AUTH, CHARSET or PASSDB module.
+SHLD_MODULE = $(SHLD) $(LDSHFLAGS) $(MODULE_EXPORTS) \
+             -o $@ @[EMAIL PROTECTED] [EMAIL PROTECTED]
+
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_LSA_OBJ)
        @echo "Linking $@"
+       @$(SHLD_MODULE) $(RPC_LSA_OBJ)
        @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_LSA_OBJ) -lc \
                @[EMAIL PROTECTED] [EMAIL PROTECTED]
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_SAMR_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_SAMR_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_SAMR_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_UNIXINFO_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_UNIXINFO_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_UNIXINFO_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_EPMAPPER_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_EPMAPPER_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_SVC_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_SVC_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_SVC_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_SVC_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_SVCCTL_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_SVCCTL_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_SVCCTL_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_NTSVCS_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_NTSVCS_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_NTSVCS_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_WKS_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_WKS_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_WKS_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_NETLOG_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_NETLOG_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_NETLOG_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_REG_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_REG_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_REG_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_INITSHUTDOWN_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_INITSHUTDOWN_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_INITSHUTDOWN_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_LSA_DS_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_LSA_DS_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_LSA_DS_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_SPOOLSS_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_SPOOLSS_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_SPOOLSS_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_EVENTLOG_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_EVENTLOG_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_EVENTLOG_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_DFS_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_DFS_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_DFS_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(RPC_ECHO_OBJ)
        @echo "Linking $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(RPC_ECHO_OBJ) -lc \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(RPC_ECHO_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
        @echo "Linking $@"
@@ -1429,209 +1424,174 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(AUTH_BUILTIN_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_BUILTIN_OBJ) @[EMAIL PROTECTED] 
[EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(AUTH_BUILTIN_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(AUTH_DOMAIN_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_DOMAIN_OBJ) @[EMAIL PROTECTED] 
[EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(AUTH_DOMAIN_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(AUTH_SCRIPT_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_SCRIPT_OBJ) @[EMAIL PROTECTED] 
[EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(AUTH_SCRIPT_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(AUTH_SERVER_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_SERVER_OBJ) @[EMAIL PROTECTED] 
[EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(AUTH_SERVER_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(AUTH_WINBIND_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_WINBIND_OBJ) @[EMAIL PROTECTED] 
[EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(AUTH_WINBIND_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(AUTH_UNIX_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_UNIX_OBJ) @[EMAIL PROTECTED] [EMAIL 
PROTECTED]
+       @$(SHLD_MODULE) $(AUTH_UNIX_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(AUTH_SAM_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_SAM_OBJ) @[EMAIL PROTECTED] [EMAIL 
PROTECTED]
+       @$(SHLD_MODULE) $(AUTH_SAM_OBJ)
 
-bin/[EMAIL PROTECTED]@: passdb/pdb_ldap.o
+bin/[EMAIL PROTECTED]@: passdb/pdb_ldap.o passdb/pdb_nds.o
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) $(LDAP_LIBS) -o $@ passdb/pdb_ldap.o \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) passdb/pdb_ldap.o passdb/pdb_nds.o $(LDAP_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists passdb/pdb_tdb.o
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ passdb/pdb_tdb.o \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) passdb/pdb_tdb.o
 
 bin/[EMAIL PROTECTED]@: proto_exists passdb/pdb_smbpasswd.o
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ passdb/pdb_smbpasswd.o \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) passdb/pdb_smbpasswd.o
 
 bin/[EMAIL PROTECTED]@: proto_exists nsswitch/idmap_rid.o
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_rid.o \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) nsswitch/idmap_rid.o
 
 bin/[EMAIL PROTECTED]@: nsswitch/idmap_ad.o
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ nsswitch/idmap_ad.o \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) nsswitch/idmap_ad.o
 
 bin/[EMAIL PROTECTED]@: proto_exists $(DEVEL_HELP_WEIRD_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(DEVEL_HELP_WEIRD_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(DEVEL_HELP_WEIRD_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(CP850_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(CP850_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(CP850_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(CP437_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(CP437_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(CP437_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(CHARSET_MACOSXFS_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(CHARSET_MACOSXFS_OBJ) \
-               -framework CoreFoundation @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(CHARSET_MACOSXFS_OBJ) -framework CoreFoundation
 
 # NOTE, there is no build rule for a dynamic default VFS module because
 # this one MUST MUST MUST be built statically.
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_AUDIT_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_AUDIT_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_AUDIT_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_EXTD_AUDIT_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_EXTD_AUDIT_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_EXTD_AUDIT_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_FULL_AUDIT_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_FULL_AUDIT_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_FULL_AUDIT_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_RECYCLE_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_RECYCLE_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_RECYCLE_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_NETATALK_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_NETATALK_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_NETATALK_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_FAKE_PERMS_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_FAKE_PERMS_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_FAKE_PERMS_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_DEFAULT_QUOTA_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_DEFAULT_QUOTA_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_DEFAULT_QUOTA_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_READONLY_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_READONLY_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_READONLY_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_SHADOW_COPY_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_SHADOW_COPY_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_SHADOW_COPY_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_CAP_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_CAP_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_CAP_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_EXPAND_MSDFS_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_EXPAND_MSDFS_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_EXPAND_MSDFS_OBJ)
 
-bin/[EMAIL PROTECTED]@: $(VFS_AFSACL_OBJ:.o=.po)
+bin/[EMAIL PROTECTED]@: $(VFS_AFSACL_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_AFSACL_OBJ:.o=.po) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_AFSACL_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(VFS_POSIXACL_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_POSIXACL_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_POSIXACL_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(VFS_AIXACL_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_AIXACL_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_AIXACL_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(VFS_AIXACL2_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_AIXACL2_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_AIXACL2_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(VFS_SOLARISACL_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_SOLARISACL_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_SOLARISACL_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_IRIXACL_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_IRIXACL_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_IRIXACL_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_HPUXACL_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_HPUXACL_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_HPUXACL_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(VFS_TRU64ACL_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_TRU64ACL_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_TRU64ACL_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_CATIA_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_CATIA_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_CATIA_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_CACHEPRIME_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_CACHEPRIME_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_CACHEPRIME_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_PREALLOC_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_PREALLOC_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_PREALLOC_OBJ)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(VFS_COMMIT_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_COMMIT_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_COMMIT_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(VFS_GPFS_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_GPFS_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_GPFS_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(VFS_NOTIFY_FAM_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_NOTIFY_FAM_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_NOTIFY_FAM_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(VFS_READAHEAD_OBJ)
        @echo "Building plugin $@"
-       @$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_READAHEAD_OBJ) \
-               @[EMAIL PROTECTED] [EMAIL PROTECTED]
+       @$(SHLD_MODULE) $(VFS_READAHEAD_OBJ)
 
 #########################################################
 ## IdMap NSS plugins
@@ -1727,6 +1687,8 @@
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) 
$(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) 
$(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) 
$(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
+       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) [EMAIL 
PROTECTED]@ [EMAIL PROTECTED]@
+       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) [EMAIL 
PROTECTED]@ [EMAIL PROTECTED]@
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) [EMAIL 
PROTECTED]@ [EMAIL PROTECTED]@
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) 
[EMAIL PROTECTED]@ [EMAIL PROTECTED]@
        @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) 
[EMAIL PROTECTED]@ [EMAIL PROTECTED]@

Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in      2007-04-20 12:23:36 UTC (rev 
22412)
+++ branches/SAMBA_3_0/source/configure.in      2007-04-20 16:07:16 UTC (rev 
22413)
@@ -259,6 +259,7 @@
 AC_SUBST(SAMBA_CPPFLAGS)
 AC_SUBST(SHELL)
 AC_SUBST(LDSHFLAGS)
+AC_SUBST(MODULE_EXPORTS)
 AC_SUBST(SONAMEFLAG)
 AC_SUBST(SHLD)
 AC_SUBST(HOST_OS)
@@ -1672,11 +1673,13 @@
 # these are the defaults, good for lots of systems
 HOST_OS="$host_os"
 LDSHFLAGS="-shared"
+MODULE_EXPORTS=""
 SONAMEFLAG="#"
 SHLD="\${CC} \${CFLAGS}"
 PICFLAG="${PIE_CFLAGS}"
 SHLIBEXT="so"
 
+
 # this bit needs to be modified for each OS that supports share libs
 # You need to specify how to create a shared library and
 # how to compile C code to produce PIC object files
@@ -1850,6 +1853,7 @@
                *darwin*)   AC_DEFINE(DARWINOS,1,[Whether the host os is 
Darwin/MacOSX])
                        BLDSHARED="true"
                        LDSHFLAGS="-bundle -flat_namespace -undefined suppress"
+                       MODULE_EXPORTS="-exported_symbols_list 
\$(srcdir)/modules/exports.darwin"
                        SHLIBEXT="dylib"
                        # Since gcc doesn't fail on unrecognised options, the
                        # PIE test incorrectly succeeds. Darwin gcc does not

Added: branches/SAMBA_3_0/source/modules/exports.darwin
===================================================================
--- branches/SAMBA_3_0/source/modules/exports.darwin    2007-04-20 12:23:36 UTC 
(rev 22412)
+++ branches/SAMBA_3_0/source/modules/exports.darwin    2007-04-20 16:07:16 UTC 
(rev 22413)
@@ -0,0 +1 @@
+_init_module

Reply via email to