[SCM] Samba Shared Repository - branch master updated - 5dce4148a3d30cbc0ca434049761434c5cc8cb33

[Jelmer Vernooij]

The branch, master has been updated
       via  5dce4148a3d30cbc0ca434049761434c5cc8cb33 (commit)
       via  465f78021e609719bf25b7d2933c47b7ab1b6940 (commit)
      from  7fd114bab72e4cc9bdb7a0017055b68ea7523f0a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5dce4148a3d30cbc0ca434049761434c5cc8cb33
Merge: 465f78021e609719bf25b7d2933c47b7ab1b6940 7fd114bab72e4cc9bdb7a0017055b68ea7523f0a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 23 19:30:16 2008 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 465f78021e609719bf25b7d2933c47b7ab1b6940
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 23 19:28:22 2008 +0100

    Move Samba4-specific file out of common libtevent.

-----------------------------------------------------------------------

Summary of changes:
 lib/tevent/config.mk                           |    2 +-
 source4/lib/basic.mk                           |    1 +
 source4/lib/events/config.mk                   |    2 +-
 source4/lib/events/events_dummy.c              |    4 ----
 {lib/tevent => source4/lib/events}/tevent_s4.c |    0 
 5 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 source4/lib/events/events_dummy.c
 rename {lib/tevent => source4/lib/events}/tevent_s4.c (100%)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/config.mk b/lib/tevent/config.mk
index bce92bb..01c628c 100644
--- 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 4d07668..4b40ed4 100644
--- 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 b9d6879..a1b2cd2 100644
--- 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
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


-- 
Samba Shared Repository