diff options
| author | Jeremy Allison <jeremy@jeremy-desktop.(none)> | 2008-12-23 10:43:02 -0800 |
|---|---|---|
| committer | Jeremy Allison <jeremy@jeremy-desktop.(none)> | 2008-12-23 10:43:02 -0800 |
| commit | 7e1f0e272ca2db577a929a2bbef651cf5759535e (patch) | |
| tree | 7a2dd5054536abcc7fd0590f95283243cbc497c8 | |
| parent | aa4abac6b73db7be694bc9f6f097092271357d20 (diff) | |
| parent | 5dce4148a3d30cbc0ca434049761434c5cc8cb33 (diff) | |
| download | samba-7e1f0e272ca2db577a929a2bbef651cf5759535e.tar.gz samba-7e1f0e272ca2db577a929a2bbef651cf5759535e.tar.bz2 samba-7e1f0e272ca2db577a929a2bbef651cf5759535e.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
| -rw-r--r-- | lib/tevent/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/basic.mk | 1 | ||||
| -rw-r--r-- | source4/lib/events/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/events/events_dummy.c | 4 | ||||
| -rw-r--r-- | source4/lib/events/tevent_s4.c (renamed from lib/tevent/tevent_s4.c) | 0 |
5 files changed, 3 insertions, 6 deletions
diff --git a/lib/tevent/config.mk b/lib/tevent/config.mk index bce92bb82d..01c628cd2c 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 4d076684cd..4b40ed41d4 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 b9d6879b3c..a1b2cd218a 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 15bb25e953..0000000000 --- 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 index 80267fdd22..80267fdd22 100644 --- a/lib/tevent/tevent_s4.c +++ b/source4/lib/events/tevent_s4.c |