Ignore:
Timestamp:
Jun 22, 2008, 3:30:02 AM (17 years ago)
Author:
Paul Smedley
Message:

Update trunk to 3.2.0rc2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/samba/source/Makefile

    r136 r137  
    3939# and --enable-krb5developer.
    4040DEVELOPER_CFLAGS=-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER -Werror-implicit-function-declaration
    41 CFLAGS= -O -D_SAMBA_BUILD_=3 -Zomf
     41CFLAGS= -O -D_SAMBA_BUILD_=3
    4242CPPFLAGS=-DHAVE_CONFIG_H  -Iinclude -I./include -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc -I./popt
    4343
    4444EXEEXT=.exe
    45 AR=emxomfar.exe
    46 LDSHFLAGS=shared-libraries-disabled -Zexe -Zomf -Zmap -D__ST_MT_ERRNO__ -s
    47 LDFLAGS= -Zexe -Zomf -Zmap -D__ST_MT_ERRNO__ -s
    48 
    49 WINBIND_NSS_LDSHFLAGS=shared-libraries-disabled -Zexe -Zomf -Zmap -D__ST_MT_ERRNO__ -s
     45AR=ar.exe
     46LDSHFLAGS=shared-libraries-disabled  -Zexe -Zomf -Zmap -Zargs-wild -Zbin-files -D__ST_MT_ERRNO__ -s
     47LDFLAGS=  -Zexe -Zomf -Zmap -Zargs-wild -Zbin-files -D__ST_MT_ERRNO__ -s
     48
     49WINBIND_NSS_LDSHFLAGS=shared-libraries-disabled -Zexe -Zomf -Zmap -Zargs-wild -Zbin-files -D__ST_MT_ERRNO__ -s
    5050AWK=gawk
    5151PICFLAG=
    5252DYNEXP=
    53 PERL=u:/Perl/bin/5.8.0/perl.exe
     53PERL=e:/Perl/bin/perl.exe
    5454
    5555PIDL_ARGS=
     
    6969DNSSD_LIBS=
    7070
    71 INSTALLCMD=u:/moztools/install.exe
     71INSTALLCMD=u:/bin/install.exe
    7272INSTALLLIBCMD_SH=:
    7373INSTALLLIBCMD_A=$(INSTALLCMD)
     
    146146LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
    147147LIBTALLOC=$(LIBTALLOC_STATIC_TARGET)
     148LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.syms
     149LIBTALLOC_HEADERS=$(srcdir)/lib/talloc/talloc.h
    148150
    149151LIBTDB_SHARED_TARGET=bin/libtdb.shared_libraries_disabled
     
    156158LIBSMBSHAREMODES=bin/libsmbsharemodes.a
    157159LIBADDNS=bin/libaddns.a
    158 LIBWBCLIENT=
     160
     161LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.shared_libraries_disabled
     162LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
     163LIBWBCLIENT=bin/libwbclient.a
     164LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.syms
     165LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h
    159166
    160167LIBNETAPI_SHARED_TARGET=bin/libnetapi.shared_libraries_disabled
    161168LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
    162169LIBNETAPI=$(LIBNETAPI_STATIC_TARGET)
     170LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.syms
     171LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
    163172
    164173FLAGS1 = $(CFLAGS)  -I$(srcdir)/iniparser/src -Iinclude -I./include  -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc $(CPPFLAGS)
     
    387396             libads/ads_struct.o libads/kerberos_keytab.o \
    388397             libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \
    389              libads/cldap.o libads/ldap_schema.o libads/util.o libads/ndr.o
     398             libads/ldap_schema.o libads/util.o libads/ndr.o
    390399
    391400LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o \
     
    421430LIBSAMBA_OBJ = $(LIBSMB_OBJ0) \
    422431               $(LIBSMB_ERR_OBJ)
     432
     433CLDAP_OBJ = libads/cldap.o
    423434
    424435LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
     
    433444             $(LIBSAMBA_OBJ) \
    434445             $(LIBNMB_OBJ) \
    435              $(LIBNBT_OBJ)
     446             $(LIBNBT_OBJ) \
     447             $(CLDAP_OBJ)
    436448
    437449RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o
     
    712724
    713725NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
    714            $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ)
     726           $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
     727           librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    715728
    716729SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
     
    891904
    892905CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
    893           $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ)
     906          $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
     907          librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    894908
    895909CIFS_MOUNT_OBJ = client/mount.cifs.o
     
    906920
    907921SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) \
    908         $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ)
     922        $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
     923        librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    909924
    910925MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
    911                  $(LIB_NONSMBD_OBJ)
     926                 $(LIB_NONSMBD_OBJ) \
     927                 librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    912928
    913929MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
    914                  $(LIB_NONSMBD_OBJ)
     930                 $(LIB_NONSMBD_OBJ) \
     931                 librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    915932
    916933LOCKTEST_OBJ = torture/locktest.o $(PARAM_OBJ) $(LOCKING_OBJ) $(KRBCLIENT_OBJ) \
    917                $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ)
     934               $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
     935               librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    918936
    919937NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
    920                  $(LIB_NONSMBD_OBJ)
     938                 $(LIB_NONSMBD_OBJ) \
     939                 librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    921940
    922941PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
    923942                $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \
    924                 $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ)
    925 
     943                $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ) \
     944                librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    926945
    927946VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ)
     
    932951
    933952LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
    934                 $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ)
     953                $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
     954                librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    935955
    936956SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
     
    973993
    974994SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
    975                  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ)
     995                 $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
     996                 librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    976997
    977998PROTO_OBJ = $(SMBD_OBJ_MAIN) $(LIBNDR_OBJ) $(LIBNDR_GEN_OBJ) \
     
    9961017
    9971018WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
    998         $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
     1019        $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
     1020        librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
    9991021
    10001022PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
     
    10701092LDB_OBJ = ${LDB_COMMON_OBJ} ${LDB_TDB_OBJ} ${LDB_LDAP_OBJ} ${LDB_MODULES_OBJ}
    10711093
    1072 LDB_CMDLINE_OBJ = $(PARAM_OBJ) $(LIBSMB_OBJ) \
    1073           $(RPC_PARSE_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \
    1074           $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
    1075           $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
    1076           $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
    1077           $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
    1078           $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \
     1094LDB_CMDLINE_OBJ = $(PARAM_OBJ) \
     1095          $(POPT_LIB_OBJ) $(LIB_OBJ) $(LIB_DUMMY_OBJ) $(LIBSMB_ERR_OBJ0) \
     1096          $(RPC_PARSE_OBJ1) $(SECRETS_OBJ) \
    10791097          $(LDB_OBJ) lib/ldb/tools/cmdline.o
    10801098
     
    13401358                -lpopt $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
    13411359                $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
    1342                     \
    1343                
     1360                   
    13441361
    13451362bin/profiles.exe: $(BINARY_PREREQS) $(PROFILES_OBJ)   
     
    15331550        @echo Linking $@
    15341551        @$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
    1535                 $(LIBS) -lpopt $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
    1536                 $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
     1552                $(LIBS) -lpopt $(LDAP_LIBS) \
    15371553                 
    15381554
     
    15401556        @echo Linking $@
    15411557        @$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \
    1542                 $(LIBS) -lpopt $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
    1543                 $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
     1558                $(LIBS) -lpopt $(LDAP_LIBS) \
    15441559                 
    15451560
    15461561bin/ldbadd.exe: $(BINARY_PREREQS) $(LDBADD_OBJ)   
    15471562        @echo Linking $@
    1548         @$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
    1549                 -lpopt $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
    1550                 $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
     1563        @$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) \
     1564                $(LIBS) -lpopt $(LDAP_LIBS) \
    15511565                 
    15521566
    15531567bin/ldbmodify.exe: $(BINARY_PREREQS) $(LDBMODIFY_OBJ)   
    15541568        @echo Linking $@
    1555         @$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
    1556                 -lpopt $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
    1557                 $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
     1569        @$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) \
     1570                $(LIBS) -lpopt $(LDAP_LIBS) \
    15581571                 
    15591572
    15601573bin/ldbdel.exe: $(BINARY_PREREQS) $(LDBDEL_OBJ)   
    15611574        @echo Linking $@
    1562         @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
    1563                 -lpopt $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
    1564                 $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
     1575        @$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
     1576                $(LIBS) -lpopt $(LDAP_LIBS) \
    15651577                 
    15661578
    1567 $(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ)
     1579MKSYMS_SH = $(srcdir)/script/mksyms.sh
     1580
     1581$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
     1582        @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
     1583
     1584$(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
    15681585        @echo Linking shared library $@
    15691586        @$(SHLD_DSO) $(LIBTALLOC_OBJ) \
     
    15731590$(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
    15741591        @echo Linking non-shared library $@
    1575         @-$(AR) rc $@ $(LIBTALLOC_OBJ0)
    1576 
    1577 MKSYMS_SH = $(srcdir)/script/mksyms.sh
     1592        @-$(AR) -rc $@ $(LIBTALLOC_OBJ0)
    15781593
    15791594$(LIBTDB_SYMS): $(LIBTDB_HEADERS)
     
    15881603$(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
    15891604        @echo Linking non-shared library $@
    1590         @-$(AR) rc $@ $(LIBTDB_OBJ0)
    1591 
    1592 bin/libwbclient.shared_libraries_disabled: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ)
     1605        @-$(AR) -rc $@ $(LIBTDB_OBJ0)
     1606
     1607$(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
     1608        @$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS)
     1609
     1610$(LIBWBCLIENT_SHARED_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS)
    15931611        @echo Linking shared library $@
    15941612        @$(SHLD_DSO)  $(LIBWBCLIENT_OBJ) \
     
    15961614        @ln -s -f `basename $@` $@.$(SONAME_VER)
    15971615
    1598 bin/libwbclient.a: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
     1616$(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
    15991617        @echo Linking non-shared library $@
    1600         @-$(AR) rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
     1618        @-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
    16011619
    16021620bin/libaddns.shared_libraries_disabled: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
     
    16081626bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
    16091627        @echo Linking non-shared library $@
    1610         @-$(AR) rc $@ $(LIBADDNS_OBJ)
    1611 
    1612 $(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ)   
     1628        @-$(AR) -rc $@ $(LIBADDNS_OBJ)
     1629
     1630$(LIBNETAPI_SYMS): $(LIBNETAPI_HEADERS)
     1631        @$(MKSYMS_SH) $(AWK) $@ $(LIBNETAPI_HEADERS)
     1632
     1633$(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS)   
    16131634        @echo Linking shared library $@
    16141635        @$(SHLD_DSO) $(LIBNETAPI_OBJ) \
     
    16201641$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1)
    16211642        @echo Linking non-shared library $@
    1622         @-$(AR) rc $@ $(LIBNETAPI_OBJ1)
     1643        @-$(AR) -rc $@ $(LIBNETAPI_OBJ1)
    16231644
    16241645bin/libsmbclient.shared_libraries_disabled: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)   
     
    16311652bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0)
    16321653        @echo Linking non-shared library $@
    1633         @-$(AR) rc $@ $(LIBSMBCLIENT_OBJ0)
     1654        @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0)
    16341655
    16351656bin/libsmbsharemodes.shared_libraries_disabled: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) 
     
    16421663bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ)
    16431664        @echo Linking non-shared library $@
    1644         @-$(AR) rc $@ $(LIBSMBSHAREMODES_OBJ)
     1665        @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ)
    16451666
    16461667# This is probably wrong for anything other than the GNU linker.
     
    17591780        @echo "Linking shared library $@"
    17601781        @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam  \
    1761                 shared-libraries-disabled`basename $@`
     1782                 shared-libraries-disabled`basename $@`
    17621783
    17631784bin/builtin.shared_libraries_disabled: $(BINARY_PREREQS) $(AUTH_BUILTIN_OBJ)
     
    21192140        -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
    21202141        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
    2121         -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/talloc/talloc.h $(DESTDIR)${prefix}/include
     2142        -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include
    21222143
    21232144installlibtdb: installdirs libtdb
     
    22602281                bin/libwbclient.so.0 bin/timelimit \
    22612282                .headers.stamp */src/*.o proto_exists \
    2262                 $(LIBTDB_SYMS)
     2283                $(LIBTALLOC_SYMS) $(LIBWBCLIENT_SYMS) $(LIBTDB_SYMS) $(LIBNETAPI_SYMS)
    22632284        -rm -rf t_dir
    22642285
Note: See TracChangeset for help on using the changeset viewer.