diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-06-28 11:01:20 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-06-30 09:25:30 +0200 |
| commit | 780fa9f9e677ded006dd54e2ec7bdbcd10348b72 (patch) | |
| tree | bf00bb6ba1a0c66e5c53df9ec0843509256b49f6 /source4/lib/talloc | |
| parent | 27970ccc30d6ebecbaff1e9a1b108ad981dcba70 (diff) | |
| download | samba-780fa9f9e677ded006dd54e2ec7bdbcd10348b72.tar.gz samba-780fa9f9e677ded006dd54e2ec7bdbcd10348b72.tar.bz2 samba-780fa9f9e677ded006dd54e2ec7bdbcd10348b72.zip | |
lib/talloc: build as MERGED_OBJ instead of STATIC_LIBRARY
metze
(This used to be commit 5bf414efbdf279fd1b85eb47e7b47656bc435f11)
Diffstat (limited to 'source4/lib/talloc')
| -rw-r--r-- | source4/lib/talloc/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 84848ae77a..c13e1b79ab 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -1,5 +1,5 @@ [LIBRARY::LIBTALLOC] -OUTPUT_TYPE = STATIC_LIBRARY +OUTPUT_TYPE = MERGED_OBJ CFLAGS = -Ilib/talloc LIBTALLOC_OBJ_FILES = lib/talloc/talloc.o |