shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

Merge pull request #256 from kaysievers/wip

Browse Source 
libsystemd: remove list of symbols to export only in the future
This commit is contained in:
Kay Sievers 2015-06-17 17:18:10 +02:00
commit a54941f1b4
3 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -2841,6 +2841,7 @@ libsystemd_internal_la_SOURCES = \
src/systemd/sd-network.h \
src/systemd/sd-hwdb.h \
src/systemd/sd-device.h \
src/libsystemd/libsystemd.sym \
src/libsystemd/sd-bus/sd-bus.c \
src/libsystemd/sd-bus/bus-control.c \
src/libsystemd/sd-bus/bus-control.h \
@ -2917,9 +2918,6 @@ libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-resolve/sd-resolve.c \
src/libsystemd/sd-resolve/resolve-util.h
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/libsystemd.sym
libsystemd_internal_la_LIBADD = \
libbasic.la \
-lresolv
@ -2928,14 +2926,10 @@ noinst_LTLIBRARIES += \
libsystemd-internal.la
EXTRA_DIST += \
src/libsystemd/libsystemd.sym.m4 \
src/libsystemd/libsystemd.pc.in \
src/libsystemd/sd-bus/DIFFERENCES \
src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
BUILT_SOURCES += \
src/libsystemd/libsystemd.sym
libsystemd_la_SOURCES = \
$(libsystemd_internal_la_SOURCES) \
$(libsystemd_journal_internal_la_SOURCES)
@ -2950,7 +2944,7 @@ libsystemd_la_CFLAGS = \
libsystemd_la_LDFLAGS = \
$(AM_LDFLAGS) \
-version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
-Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
libsystemd_la_LIBADD = \
$(libsystemd_internal_la_LIBADD) \

1
src/libsystemd/.gitignore vendored
View File

@ -1,2 +1 @@
/libsystemd.sym
/libsystemd.pc

38
src/libsystemd/libsystemd.sym.m4 → src/libsystemd/libsystemd.sym
View File

@ -459,41 +459,3 @@ global:
sd_event_source_get_signal;
sd_event_source_get_child_pid;
} LIBSYSTEMD_220;
m4_ifdef(`ENABLE_KDBUS',
LIBSYSTEMD_FUTURE {
global:
/* sd-utf8 */
sd_utf8_is_valid;
sd_ascii_is_valid;
/* sd-resolve */
sd_resolve_default;
sd_resolve_new;
sd_resolve_ref;
sd_resolve_unref;
sd_resolve_get_fd;
sd_resolve_get_events;
sd_resolve_get_timeout;
sd_resolve_process;
sd_resolve_wait;
sd_resolve_get_tid;
sd_resolve_attach_event;
sd_resolve_detach_event;
sd_resolve_get_event;
sd_resolve_getaddrinfo;
sd_resolve_getnameinfo;
sd_resolve_res_query;
sd_resolve_res_search;
sd_resolve_query_ref;
sd_resolve_query_unref;
sd_resolve_query_is_done;
sd_resolve_query_get_userdata;
sd_resolve_query_set_userdata;
sd_resolve_query_get_resolve;
/* sd-path */
sd_path_home;
sd_path_search;
} LIBSYSTEMD_220;
)