From 780fa9f9e677ded006dd54e2ec7bdbcd10348b72 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 28 Jun 2008 11:01:20 +0200
Subject: lib/talloc: build as MERGED_OBJ instead of STATIC_LIBRARY

metze
(This used to be commit 5bf414efbdf279fd1b85eb47e7b47656bc435f11)
---
 source4/lib/talloc/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4')

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
-- 
cgit