summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-06-28 11:01:20 +0200
committerStefan Metzmacher <metze@samba.org>2008-06-30 09:25:30 +0200
commit5bf414efbdf279fd1b85eb47e7b47656bc435f11 (patch)
tree41034920cac4c9875eb10b3466291445f5d89eb0
parenta2a506ba2e044699d147486e987b11d839373784 (diff)
downloadsamba-5bf414efbdf279fd1b85eb47e7b47656bc435f11.tar.gz
lib/talloc: build as MERGED_OBJ instead of STATIC_LIBRARY
metze
-rw-r--r--source/lib/talloc/config.mk2
1 files changed, 1 insertions, 1 deletions
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