diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-06-30 19:34:11 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-06-30 19:34:11 +1000 |
| commit | 91643773b8ff0727b40a230b7c41288f57e6a9cb (patch) | |
| tree | e66c67ccdf94b411cd347663234b50ed8d1c1a92 /source4/lib/talloc | |
| parent | 89c12dfd4e4594736207cda276d1b10e4bb3b26b (diff) | |
| parent | b3e202ef8cf797a79cf2b2de863db9fcc7d3b1c3 (diff) | |
| download | samba-91643773b8ff0727b40a230b7c41288f57e6a9cb.tar.gz samba-91643773b8ff0727b40a230b7c41288f57e6a9cb.tar.xz samba-91643773b8ff0727b40a230b7c41288f57e6a9cb.zip | |
Merge branch '4-0-local' into v4-0-stable
(This used to be commit dc238848b3987a187212bd8088916c5b34755b0f)
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 |