Move Samba4-specific file out of common libtevent.

diff --git a/lib/tevent/config.mk b/lib/tevent/config.mk
index bce92bb82dc3d2b586e012105d697755cd98f8d8..01c628cd2c8459466ff3e77e9b447f1c4285195a 100644 (file)
--- a/lib/tevent/config.mk
+++ b/lib/tevent/config.mk
@@ -41,7 +41,7 @@ CFLAGS = -I../lib/tevent
 # End SUBSYSTEM LIBTEVENT
 ################################################
 
-LIBTEVENT_OBJ_FILES = $(addprefix $(libteventsrcdir)/, tevent.o tevent_timed.o tevent_signal.o tevent_debug.o tevent_util.o tevent_s4.o)
+LIBTEVENT_OBJ_FILES = $(addprefix $(libteventsrcdir)/, tevent.o tevent_timed.o tevent_signal.o tevent_debug.o tevent_util.o)
 
 PUBLIC_HEADERS += $(addprefix $(libteventsrcdir)/, tevent.h tevent_internal.h)
 

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 4d076684cd0e5e64df0dacd69aa7e8367681ac65..4b40ed41d4551be32b30fe8e38cc63eb3f9db481 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -23,3 +23,4 @@ TDB_WRAP_OBJ_FILES = $(libsrcdir)/tdb_wrap.o
 PUBLIC_HEADERS += $(libsrcdir)/tdb_wrap.h
 
 SMBREADLINE_OBJ_LIST = $(SMBREADLINE_OBJ_FILES)
+

diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index b9d6879b3c80bc491e25f0b3705d3f95c8564581..a1b2cd218ac1286c54aa836b4e97bc4d214740bf 100644 (file)
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -2,6 +2,6 @@
 PUBLIC_DEPENDENCIES = LIBTEVENT
 CFLAGS = -Ilib/events
 
-LIBEVENTS_OBJ_FILES = $(addprefix $(libeventssrcdir)/, events_dummy.o)
+LIBEVENTS_OBJ_FILES = $(addprefix $(libeventssrcdir)/, tevent_s4.o)
 
 PUBLIC_HEADERS += $(addprefix $(libeventssrcdir)/, events.h events_internal.h)

diff --git a/source4/lib/events/events_dummy.c b/source4/lib/events/events_dummy.c
deleted file mode 100644 (file)
index 15bb25e..0000000
--- a/source4/lib/events/events_dummy.c
+++ /dev/null
@@ -1,4 +0,0 @@
-void __events_dummy(void)
-{
-}
-

diff --git a/lib/tevent/tevent_s4.c b/source4/lib/events/tevent_s4.c
similarity index 100%
rename from lib/tevent/tevent_s4.c
rename to source4/lib/events/tevent_s4.c