diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 19:06:17 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 19:06:17 +0100 |
| commit | 602f4635da0935abffdda2a29ec302a775fdbe62 (patch) | |
| tree | 9629af40ff9f530b43578d0e40f3e83a2be43cfc /source4/lib/socket | |
| parent | 6e0522c3cae9c99b589db67727ee1256c6da82ef (diff) | |
| download | samba-602f4635da0935abffdda2a29ec302a775fdbe62.tar.gz samba-602f4635da0935abffdda2a29ec302a775fdbe62.tar.bz2 samba-602f4635da0935abffdda2a29ec302a775fdbe62.zip | |
Get rid of 'INTEGRATED' build of modules - now replaced by 'MERGED_OBJ'
(This used to be commit 269cbf84d8b7dbf3bc88adc04ae283dc908af5ac)
Diffstat (limited to 'source4/lib/socket')
| -rw-r--r-- | source4/lib/socket/config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 |