[systemd-commits] 2 commits - Makefile.am src/activate src/analyze src/libsystemd-bus
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Nov 7 03:22:55 CET 2013
Makefile.am | 37 +++-----------------
src/activate/Makefile | 1
src/analyze/analyze.c | 1
src/libsystemd-bus/libsystemd-bus.sym | 50 +++++++++++++++++++++++++++-
src/libsystemd-bus/libsystemd-event.sym | 57 --------------------------------
5 files changed, 58 insertions(+), 88 deletions(-)
New commits:
commit c8a8806e7705cb2e465b6727415c955fd5ef194b
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Nov 7 03:20:40 2013 +0100
build-sys: merge sd-event into sd-bus
The sd-event APIs should be available only as part of libsystemd-bus so
that the utility calls are not linked into each independently and we can
minimize the number of libraries we have.
diff --git a/Makefile.am b/Makefile.am
index ce5ff63..a49d073 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,10 +63,6 @@ LIBSYSTEMD_BUS_CURRENT=0
LIBSYSTEMD_BUS_REVISION=0
LIBSYSTEMD_BUS_AGE=0
-LIBSYSTEMD_EVENT_CURRENT=0
-LIBSYSTEMD_EVENT_REVISION=0
-LIBSYSTEMD_EVENT_AGE=0
-
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
dbussessionservicedir=@dbussessionservicedir@
@@ -1939,32 +1935,13 @@ EXTRA_DIST += \
src/libsystemd-daemon/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
-libsystemd_event_la_SOURCES = \
- src/libsystemd-bus/sd-event.c \
- src/systemd/sd-event.h \
- src/libsystemd-bus/event-util.h
-
-libsystemd_event_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_EVENT_CURRENT):$(LIBSYSTEMD_EVENT_REVISION):$(LIBSYSTEMD_EVENT_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-event.sym
-
-EXTRA_DIST += \
- src/libsystemd-bus/libsystemd-event.sym
-
-lib_LTLIBRARIES += \
- libsystemd-event.la
-
-libsystemd_event_la_LIBADD = \
- libsystemd-id128-internal.la \
- libsystemd-shared.la
-
libsystemd_bus_la_SOURCES = \
src/systemd/sd-bus.h \
src/systemd/sd-bus-protocol.h \
src/systemd/sd-bus-vtable.h \
src/systemd/sd-memfd.h \
src/systemd/sd-utf8.h \
+ src/systemd/sd-event.h \
src/libsystemd-bus/sd-bus.c \
src/libsystemd-bus/bus-control.c \
src/libsystemd-bus/bus-control.h \
@@ -1997,13 +1974,14 @@ libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/sd-memfd.c \
src/libsystemd-bus/bus-util.c \
src/libsystemd-bus/bus-util.h \
- src/libsystemd-bus/sd-utf8.c
+ src/libsystemd-bus/sd-utf8.c \
+ src/libsystemd-bus/sd-event.c \
+ src/libsystemd-bus/event-util.h
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd-shared.la \
- libsystemd-daemon.la \
- libsystemd-event.la
+ libsystemd-daemon.la
libsystemd_bus_la_CFLAGS = \
$(AM_CFLAGS) \
@@ -2021,8 +1999,7 @@ lib_LTLIBRARIES += \
libsystemd-bus.la
libsystemd_bus_internal_la_SOURCES = \
- $(libsystemd_bus_la_SOURCES) \
- $(libsystemd_event_la_SOURCES)
+ $(libsystemd_bus_la_SOURCES)
libsystemd_bus_internal_la_CFLAGS = \
$(libsystemd_bus_la_CFLAGS)
@@ -3263,7 +3240,7 @@ systemd_socket_proxyd_SOURCES = \
systemd_socket_proxyd_LDADD = \
libsystemd-logs.la \
- libsystemd-event.la \
+ libsystemd-bus.la \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
libsystemd-shared.la \
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 3b793f6..22bf076 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1085,6 +1085,7 @@ static int dot(sd_bus *bus, char* patterns[]) {
return 0;
}
+
static int dump(sd_bus *bus, char **args) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
diff --git a/src/libsystemd-bus/libsystemd-bus.sym b/src/libsystemd-bus/libsystemd-bus.sym
index 850f370..5eecfa1 100644
--- a/src/libsystemd-bus/libsystemd-bus.sym
+++ b/src/libsystemd-bus/libsystemd-bus.sym
@@ -178,7 +178,7 @@ global:
sd_bus_error_is_set;
sd_bus_error_has_name;
- /* mem-fd functions */
+ /* sd-memfd functions */
sd_memfd_new;
sd_memfd_make;
sd_memfd_new_and_map;
@@ -192,6 +192,54 @@ global:
sd_memfd_get_size;
sd_memfd_set_size;
+ /* sd-event functions */
+ sd_event_new;
+ sd_event_ref;
+ sd_event_unref;
+
+ sd_event_add_io;
+ sd_event_add_monotonic;
+ sd_event_add_realtime;
+ sd_event_add_signal;
+ sd_event_add_child;
+ sd_event_add_defer;
+ sd_event_add_quit;
+
+ sd_event_run;
+ sd_event_loop;
+
+ sd_event_get_state;
+ sd_event_get_quit;
+ sd_event_request_quit;
+ sd_event_get_now_realtime;
+ sd_event_get_now_monotonic;
+ sd_event_get;
+
+ sd_event_source_ref;
+ sd_event_source_unref;
+
+ sd_event_source_set_prepare;
+ sd_event_source_get_pending;
+ sd_event_source_get_priority;
+ sd_event_source_set_priority;
+ sd_event_source_get_enabled;
+ sd_event_source_set_enabled;
+ sd_event_source_get_userdata;
+ sd_event_source_get_io_fd;
+ sd_event_source_get_io_events;
+ sd_event_source_set_io_events;
+ sd_event_source_get_io_revents;
+ sd_event_source_get_time;
+ sd_event_source_set_time;
+ sd_event_source_set_time_accuracy;
+ sd_event_source_get_time_accuracy;
+ sd_event_source_get_signal;
+ sd_event_source_get_child_pid;
+
+ /* sd-utf8 function */
+ sd_utf8_is_valid;
+ sd_ascii_is_valid;
+
local:
*;
};
diff --git a/src/libsystemd-bus/libsystemd-event.sym b/src/libsystemd-bus/libsystemd-event.sym
deleted file mode 100644
index d5b47ce..0000000
--- a/src/libsystemd-bus/libsystemd-event.sym
+++ /dev/null
@@ -1,57 +0,0 @@
-/***
- This file is part of systemd.
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-***/
-
-LIBSYSTEMD_EVENT_209 {
-global:
- sd_event_new;
- sd_event_ref;
- sd_event_unref;
-
- sd_event_add_io;
- sd_event_add_monotonic;
- sd_event_add_realtime;
- sd_event_add_signal;
- sd_event_add_child;
- sd_event_add_defer;
- sd_event_add_quit;
-
- sd_event_run;
- sd_event_loop;
-
- sd_event_get_state;
- sd_event_get_quit;
- sd_event_request_quit;
- sd_event_get_now_realtime;
- sd_event_get_now_monotonic;
- sd_event_get;
-
- sd_event_source_ref;
- sd_event_source_unref;
-
- sd_event_source_set_prepare;
- sd_event_source_get_pending;
- sd_event_source_get_priority;
- sd_event_source_set_priority;
- sd_event_source_get_enabled;
- sd_event_source_set_enabled;
- sd_event_source_get_userdata;
- sd_event_source_get_io_fd;
- sd_event_source_get_io_events;
- sd_event_source_set_io_events;
- sd_event_source_get_io_revents;
- sd_event_source_get_time;
- sd_event_source_set_time;
- sd_event_source_set_time_accuracy;
- sd_event_source_get_time_accuracy;
- sd_event_source_get_signal;
- sd_event_source_get_child_pid;
-
-local:
- *;
-};
commit bc801363855527cae97e9251aa17741bcd85e33e
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Nov 7 03:09:59 2013 +0100
build-sys: add Makefile symlink for src/activate/
diff --git a/src/activate/Makefile b/src/activate/Makefile
new file mode 120000
index 0000000..d0b0e8e
--- /dev/null
+++ b/src/activate/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
More information about the systemd-commits
mailing list