diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
| commit | b4017955e19723e48b41b70c7ba313dcfcda5eb9 (patch) | |
| tree | 138d37f4c9abc2dcecd38a6ba4e5c539b4927421 /source4/lib | |
| parent | 1131d4c2545355ef793e468810655c0f72828368 (diff) | |
| parent | b136033421eb045b28f5928e4d2f9604cf704690 (diff) | |
| download | samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.gz samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.bz2 samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/input.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
(This used to be commit bc11e3ef1c34923f5b13571926617a840ad554fe)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/basic.mk | 36 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/socket/config.mk | 4 |
3 files changed, 22 insertions, 22 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 53eb0d038f..a118636c52 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -1,22 +1,22 @@ # LIB BASIC subsystem -include samba3/config.mk -include socket/config.mk -include charset/config.mk -include ldb-samba/config.mk -include tls/config.mk -include registry/config.mk -include policy/config.mk -include messaging/config.mk -include events/config.mk -include cmdline/config.mk -include socket_wrapper/config.mk -include nss_wrapper/config.mk -include appweb/config.mk -include stream/config.mk -include util/config.mk -include tdr/config.mk -include dbwrap/config.mk -include crypto/config.mk +mkinclude samba3/config.mk +mkinclude socket/config.mk +mkinclude charset/config.mk +mkinclude ldb-samba/config.mk +mkinclude tls/config.mk +mkinclude registry/config.mk +mkinclude policy/config.mk +mkinclude messaging/config.mk +mkinclude events/config.mk +mkinclude cmdline/config.mk +mkinclude socket_wrapper/config.mk +mkinclude nss_wrapper/config.mk +mkinclude appweb/config.mk +mkinclude stream/config.mk +mkinclude util/config.mk +mkinclude tdr/config.mk +mkinclude dbwrap/config.mk +mkinclude crypto/config.mk [SUBSYSTEM::LIBCOMPRESSION] OBJ_FILES = compression/mszip.o diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 75ce89d6cf..0e7caa381f 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -193,5 +193,5 @@ PRIVATE_DEPENDENCIES = \ ################################################ -include tools/config.mk -include ldb_ildap/config.mk +mkinclude tools/config.mk +mkinclude ldb_ildap/config.mk diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index fe64c90b81..5a7a62d8ae 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -13,7 +13,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_SOCKET EXT_NSL # Start MODULE socket_ip [MODULE::socket_ip] SUBSYSTEM = samba-socket -OUTPUT_TYPE = INTEGRATED +OUTPUT_TYPE = MERGED_OBJ OBJ_FILES = \ socket_ip.o PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBSAMBA-ERRORS @@ -24,7 +24,7 @@ PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBSAMBA-ERRORS # Start MODULE socket_unix [MODULE::socket_unix] SUBSYSTEM = samba-socket -OUTPUT_TYPE = INTEGRATED +OUTPUT_TYPE = MERGED_OBJ OBJ_FILES = \ socket_unix.o PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL |