From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 28 Jun 2008 09:01:20 +0000 (+0200)
Subject: lib/talloc: build as MERGED_OBJ instead of STATIC_LIBRARY
X-Git-Tag: samba-4.0.0alpha5^2~3^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bf414efbdf279fd1b85eb47e7b47656bc435f11;p=thirdparty%2Fsamba.git

lib/talloc: build as MERGED_OBJ instead of STATIC_LIBRARY

metze
---

diff --git a/source/lib/talloc/config.mk b/source/lib/talloc/config.mk
index 84848ae77a7..c13e1b79abd 100644
--- a/source/lib/talloc/config.mk
+++ b/source/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