summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-06-28 10:59:02 +0200
committerStefan Metzmacher <metze@samba.org>2008-06-30 09:25:29 +0200
commit27970ccc30d6ebecbaff1e9a1b108ad981dcba70 (patch)
tree05075f68a97ddf2dc93916292cae0d5df99b1d4a
parent4deff16ddb788a4290b308fb9a51da51fc236b32 (diff)
downloadsamba-27970ccc30d6ebecbaff1e9a1b108ad981dcba70.tar.gz
samba-27970ccc30d6ebecbaff1e9a1b108ad981dcba70.tar.bz2
samba-27970ccc30d6ebecbaff1e9a1b108ad981dcba70.zip
lib/events: build as MERGED_OBJ instead of STATIC_LIBRARY
metze (This used to be commit a2a506ba2e044699d147486e987b11d839373784)
-rw-r--r--source4/lib/events/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index db70830295..127d964775 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -35,7 +35,7 @@ EVENTS_STANDARD_OBJ_FILES = $(libeventssrcdir)/events_standard.o
# Start SUBSYSTEM LIBEVENTS
[LIBRARY::LIBEVENTS]
PUBLIC_DEPENDENCIES = LIBTALLOC
-OUTPUT_TYPE = STATIC_LIBRARY
+OUTPUT_TYPE = MERGED_OBJ
CFLAGS = -Ilib/events
#
# End SUBSYSTEM LIBEVENTS