From e907d750b8e99c9a4dad6bc291f04ff9abaf1d0f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 2 Aug 2016 12:17:53 -0400 Subject: fix --- src/grp-network/libnetworkd-core/networkd-dhcp4.c | 2 +- src/grp-network/libnetworkd-core/networkd-dhcp6.c | 2 +- src/grp-network/libnetworkd-core/networkd-ipv4ll.c | 2 +- src/grp-network/libnetworkd-core/networkd-link.c | 2 +- .../libnetworkd-core/networkd-manager.c | 2 +- src/grp-network/libnetworkd-core/networkd-ndisc.c | 2 +- .../networkd-wait-online-manager.c | 4 +- src/grp-system/libcore/namespace.c | 2 +- src/grp-system/libcore/target.c | 1 - src/grp-system/libcore/target.h | 4 + src/grp-system/libcore/unit.h | 9 +- src/libshared/src/gcrypt-util.c | 2 +- src/libsystemd/src/sd-device/Makefile | 32 +----- src/libsystemd/src/sd-device/device-internal.h | 2 + src/libsystemd/src/sd-hwdb/Makefile | 32 +----- src/libsystemd/src/sd-netlink/netlink-types.c | 18 ++-- src/libsystemd/src/sd-network/Makefile | 32 +----- src/libsystemd/src/sd-resolve/Makefile | 33 +----- src/libudev/.gitignore | 1 + src/libudev/Makefile | 36 +++++++ src/libudev/libudev.pc.in | 17 +++ src/libudev/libudev.sym | 120 +++++++++++++++++++++ src/libudev/src/.gitignore | 1 - src/libudev/src/Makefile | 43 +------- src/libudev/src/libudev.pc.in | 17 --- src/libudev/src/libudev.sym | 120 --------------------- 26 files changed, 210 insertions(+), 328 deletions(-) mode change 100644 => 120000 src/libsystemd/src/sd-device/Makefile mode change 100644 => 120000 src/libsystemd/src/sd-hwdb/Makefile mode change 100644 => 120000 src/libsystemd/src/sd-network/Makefile mode change 100644 => 120000 src/libsystemd/src/sd-resolve/Makefile create mode 100644 src/libudev/.gitignore create mode 100644 src/libudev/libudev.pc.in create mode 100644 src/libudev/libudev.sym delete mode 100644 src/libudev/src/.gitignore delete mode 100644 src/libudev/src/libudev.pc.in delete mode 100644 src/libudev/src/libudev.sym (limited to 'src') diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c index b74541ed11..371613043e 100644 --- a/src/grp-network/libnetworkd-core/networkd-dhcp4.c +++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "basic/alloc-util.h" #include "basic/hostname-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp6.c b/src/grp-network/libnetworkd-core/networkd-dhcp6.c index cf2f4e3af5..9ebb162d6c 100644 --- a/src/grp-network/libnetworkd-core/networkd-dhcp6.c +++ b/src/grp-network/libnetworkd-core/networkd-dhcp6.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "systemd-network/network-internal.h" #include "systemd-network/sd-dhcp6-client.h" diff --git a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c index ac7266d0cf..d196aa909f 100644 --- a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c +++ b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include "systemd-network/network-internal.h" diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c index 53c3712cb6..f4cef69fbb 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.c +++ b/src/grp-network/libnetworkd-core/networkd-link.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include #include "basic/alloc-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c index 5ce81223bf..0f54debf07 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager.c +++ b/src/grp-network/libnetworkd-core/networkd-manager.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include #include +#include #include diff --git a/src/grp-network/libnetworkd-core/networkd-ndisc.c b/src/grp-network/libnetworkd-core/networkd-ndisc.c index 5480cc465d..1033ccc342 100644 --- a/src/grp-network/libnetworkd-core/networkd-ndisc.c +++ b/src/grp-network/libnetworkd-core/networkd-ndisc.c @@ -17,10 +17,10 @@ along with systemd; If not, see . ***/ -#include #include #include #include +#include #include "systemd-network/sd-ndisc.h" diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c index 62ae9e9b4f..02bf652c0b 100644 --- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c @@ -17,9 +17,9 @@ along with systemd; If not, see . ***/ -#include -#include #include +#include +#include #include "basic/alloc-util.h" #include "basic/time-util.h" diff --git a/src/grp-system/libcore/namespace.c b/src/grp-system/libcore/namespace.c index cb85074cce..5af026ff99 100644 --- a/src/grp-system/libcore/namespace.c +++ b/src/grp-system/libcore/namespace.c @@ -18,13 +18,13 @@ ***/ #include -#include #include #include #include #include #include #include +#include #include "basic/alloc-util.h" #include "basic/fd-util.h" diff --git a/src/grp-system/libcore/target.c b/src/grp-system/libcore/target.c index e62a49be84..74af0ced0c 100644 --- a/src/grp-system/libcore/target.c +++ b/src/grp-system/libcore/target.c @@ -23,7 +23,6 @@ #include "basic/unit-name.h" #include "dbus-target.h" -#include "target.h" #include "unit.h" static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = { diff --git a/src/grp-system/libcore/target.h b/src/grp-system/libcore/target.h index 339aea154e..9ac560ab17 100644 --- a/src/grp-system/libcore/target.h +++ b/src/grp-system/libcore/target.h @@ -19,6 +19,10 @@ along with systemd; If not, see . ***/ +#if __INCLUDE_LEVEL__ <= 1 +#error "Do not include target.h directly; use unit.h, which includes target.h." +#endif + typedef struct Target Target; struct Target { diff --git a/src/grp-system/libcore/unit.h b/src/grp-system/libcore/unit.h index df1174b837..79de5a8a89 100644 --- a/src/grp-system/libcore/unit.h +++ b/src/grp-system/libcore/unit.h @@ -23,16 +23,17 @@ #include #include +#include "shared/condition.h" +#include "shared/install.h" +#include "basic/list.h" +#include "basic/unit-name.h" + typedef struct Unit Unit; typedef struct UnitVTable UnitVTable; typedef struct UnitRef UnitRef; typedef struct UnitStatusMessageFormats UnitStatusMessageFormats; -#include "shared/condition.h" #include "failure-action.h" -#include "shared/install.h" -#include "basic/list.h" -#include "basic/unit-name.h" typedef enum KillOperation { KILL_TERMINATE, diff --git a/src/libshared/src/gcrypt-util.c b/src/libshared/src/gcrypt-util.c index 069134a4be..35e380d3d0 100644 --- a/src/libshared/src/gcrypt-util.c +++ b/src/libshared/src/gcrypt-util.c @@ -23,7 +23,7 @@ #include #include "basic/hexdecoct.h" -#include "shared/gcrypt-util.h" +#include "gcrypt-util.h" void initialize_libgcrypt(bool secmem) { const char *p; diff --git a/src/libsystemd/src/sd-device/Makefile b/src/libsystemd/src/sd-device/Makefile deleted file mode 100644 index 821bb70dfc..0000000000 --- a/src/libsystemd/src/sd-device/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# 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. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see . - -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk -include $(topsrcdir)/build-aux/Makefile.head.mk - -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libshared.CPPFLAGS) - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/sd-device/Makefile b/src/libsystemd/src/sd-device/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/src/sd-device/Makefile @@ -0,0 +1 @@ +../subdir.mk \ No newline at end of file diff --git a/src/libsystemd/src/sd-device/device-internal.h b/src/libsystemd/src/sd-device/device-internal.h index 5e5ae47339..a1a1d3c4e3 100644 --- a/src/libsystemd/src/sd-device/device-internal.h +++ b/src/libsystemd/src/sd-device/device-internal.h @@ -23,6 +23,8 @@ #include "basic/hashmap.h" #include "basic/set.h" +#include "sd-device.h" + struct sd_device { uint64_t n_ref; diff --git a/src/libsystemd/src/sd-hwdb/Makefile b/src/libsystemd/src/sd-hwdb/Makefile deleted file mode 100644 index 821bb70dfc..0000000000 --- a/src/libsystemd/src/sd-hwdb/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# 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. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see . - -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk -include $(topsrcdir)/build-aux/Makefile.head.mk - -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libshared.CPPFLAGS) - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/sd-hwdb/Makefile b/src/libsystemd/src/sd-hwdb/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/src/sd-hwdb/Makefile @@ -0,0 +1 @@ +../subdir.mk \ No newline at end of file diff --git a/src/libsystemd/src/sd-netlink/netlink-types.c b/src/libsystemd/src/sd-netlink/netlink-types.c index 3b013507bd..b4dcee26b7 100644 --- a/src/libsystemd/src/sd-netlink/netlink-types.c +++ b/src/libsystemd/src/sd-netlink/netlink-types.c @@ -17,18 +17,18 @@ along with systemd; If not, see . ***/ -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #include +#include #include -#include -#include +#include +#include +#include +#include +#include +#include #include "basic/macro.h" #include "basic/missing.h" diff --git a/src/libsystemd/src/sd-network/Makefile b/src/libsystemd/src/sd-network/Makefile deleted file mode 100644 index 821bb70dfc..0000000000 --- a/src/libsystemd/src/sd-network/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# 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. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see . - -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk -include $(topsrcdir)/build-aux/Makefile.head.mk - -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libshared.CPPFLAGS) - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/sd-network/Makefile b/src/libsystemd/src/sd-network/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/src/sd-network/Makefile @@ -0,0 +1 @@ +../subdir.mk \ No newline at end of file diff --git a/src/libsystemd/src/sd-resolve/Makefile b/src/libsystemd/src/sd-resolve/Makefile deleted file mode 100644 index 2b0ea2c84f..0000000000 --- a/src/libsystemd/src/sd-resolve/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# 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. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see . - -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk -include $(topsrcdir)/build-aux/Makefile.head.mk - -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libshared.CPPFLAGS) -systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/sd-resolve/Makefile b/src/libsystemd/src/sd-resolve/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/src/sd-resolve/Makefile @@ -0,0 +1 @@ +../subdir.mk \ No newline at end of file diff --git a/src/libudev/.gitignore b/src/libudev/.gitignore new file mode 100644 index 0000000000..0c8a5d5231 --- /dev/null +++ b/src/libudev/.gitignore @@ -0,0 +1 @@ +/libudev.pc diff --git a/src/libudev/Makefile b/src/libudev/Makefile index 8d9fecb1fb..05e622117e 100644 --- a/src/libudev/Makefile +++ b/src/libudev/Makefile @@ -23,6 +23,42 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +LIBUDEV_CURRENT=7 +LIBUDEV_REVISION=4 +LIBUDEV_AGE=6 + +include_HEADERS += \ + src/libudev/libudev.h + +rootlib_LTLIBRARIES += \ + libudev.la + +libudev_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ + -Wl,--version-script=$(srcdir)/libudev.sym + +pkgconfiglib_DATA += \ + src/libudev/libudev.pc + +EXTRA_DIST += \ + src/libudev/libudev.pc.in + +$(outdir)/test-libudev-sym.c: \ + $(srcdir)/libudev.sym \ + $(srcdir)/udev.h + $(generate-sym-test) + +nodist_test_libudev_sym_SOURCES = \ + test-libudev-sym.c +test_libudev_sym_CFLAGS = \ + $(AM_CFLAGS) \ + -Wno-deprecated-declarations +test_libudev_sym_LDADD = \ + libudev.la + +systemd.sed_files += libudev.pc + at.subdirs += src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in new file mode 100644 index 0000000000..a0f3f524e0 --- /dev/null +++ b/src/libudev/libudev.pc.in @@ -0,0 +1,17 @@ +# 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. + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libudev +Description: Library to access udev device information +Version: @VERSION@ +Libs: -L${libdir} -ludev +Cflags: -I${includedir} diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym new file mode 100644 index 0000000000..76726fca77 --- /dev/null +++ b/src/libudev/libudev.sym @@ -0,0 +1,120 @@ +/*** + 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. +***/ + +LIBUDEV_183 { +global: + udev_device_get_action; + udev_device_get_devlinks_list_entry; + udev_device_get_devnode; + udev_device_get_devnum; + udev_device_get_devpath; + udev_device_get_devtype; + udev_device_get_driver; + udev_device_get_is_initialized; + udev_device_get_parent; + udev_device_get_parent_with_subsystem_devtype; + udev_device_get_properties_list_entry; + udev_device_get_property_value; + udev_device_get_seqnum; + udev_device_get_subsystem; + udev_device_get_sysattr_list_entry; + udev_device_get_sysattr_value; + udev_device_get_sysname; + udev_device_get_sysnum; + udev_device_get_syspath; + udev_device_get_tags_list_entry; + udev_device_get_udev; + udev_device_get_usec_since_initialized; + udev_device_has_tag; + udev_device_new_from_devnum; + udev_device_new_from_environment; + udev_device_new_from_subsystem_sysname; + udev_device_new_from_syspath; + udev_device_ref; + udev_device_unref; + udev_enumerate_add_match_is_initialized; + udev_enumerate_add_match_parent; + udev_enumerate_add_match_property; + udev_enumerate_add_match_subsystem; + udev_enumerate_add_match_sysattr; + udev_enumerate_add_match_sysname; + udev_enumerate_add_match_tag; + udev_enumerate_add_nomatch_subsystem; + udev_enumerate_add_nomatch_sysattr; + udev_enumerate_add_syspath; + udev_enumerate_get_list_entry; + udev_enumerate_get_udev; + udev_enumerate_new; + udev_enumerate_ref; + udev_enumerate_scan_devices; + udev_enumerate_scan_subsystems; + udev_enumerate_unref; + udev_get_log_priority; + udev_get_userdata; + udev_list_entry_get_by_name; + udev_list_entry_get_name; + udev_list_entry_get_next; + udev_list_entry_get_value; + udev_monitor_enable_receiving; + udev_monitor_filter_add_match_subsystem_devtype; + udev_monitor_filter_add_match_tag; + udev_monitor_filter_remove; + udev_monitor_filter_update; + udev_monitor_get_fd; + udev_monitor_get_udev; + udev_monitor_new_from_netlink; + udev_monitor_receive_device; + udev_monitor_ref; + udev_monitor_set_receive_buffer_size; + udev_monitor_unref; + udev_new; + udev_queue_get_kernel_seqnum; + udev_queue_get_queue_is_empty; + udev_queue_get_queued_list_entry; + udev_queue_get_seqnum_is_finished; + udev_queue_get_seqnum_sequence_is_finished; + udev_queue_get_udev; + udev_queue_get_udev_is_active; + udev_queue_get_udev_seqnum; + udev_queue_new; + udev_queue_ref; + udev_queue_unref; + udev_ref; + udev_set_log_fn; + udev_set_log_priority; + udev_set_userdata; + udev_unref; + udev_util_encode_string; +local: + *; +}; + +LIBUDEV_189 { +global: + udev_device_new_from_device_id; +} LIBUDEV_183; + +LIBUDEV_196 { +global: + udev_hwdb_new; + udev_hwdb_ref; + udev_hwdb_unref; + udev_hwdb_get_properties_list_entry; +} LIBUDEV_189; + +LIBUDEV_199 { +global: + udev_device_set_sysattr_value; +} LIBUDEV_196; + +LIBUDEV_215 { +global: + udev_queue_flush; + udev_queue_get_fd; +} LIBUDEV_199; diff --git a/src/libudev/src/.gitignore b/src/libudev/src/.gitignore deleted file mode 100644 index 0c8a5d5231..0000000000 --- a/src/libudev/src/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/libudev.pc diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile index 2bc5227cfb..3f2f59ed39 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/src/Makefile @@ -23,17 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -LIBUDEV_CURRENT=7 -LIBUDEV_REVISION=4 -LIBUDEV_AGE=6 - -include_HEADERS += \ - src/libudev/libudev.h - -rootlib_LTLIBRARIES += \ - libudev.la - -libudev_la_SOURCES =\ +libudev_internal_la_SOURCES =\ src/libudev/libudev.sym \ src/libudev/libudev-private.h \ src/libudev/libudev-device-internal.h \ @@ -47,39 +37,10 @@ libudev_la_SOURCES =\ src/libudev/libudev-queue.c \ src/libudev/libudev-hwdb.c -libudev_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ - -Wl,--version-script=$(srcdir)/libudev.sym - -libudev_la_LIBADD = \ +libudev_internal_la_LIBADD = \ libsystemd-internal.la -pkgconfiglib_DATA += \ - src/libudev/libudev.pc - -EXTRA_DIST += \ - src/libudev/libudev.pc.in - noinst_LTLIBRARIES += \ libudev-internal.la -libudev_internal_la_SOURCES =\ - $(libudev_la_SOURCES) - -$(outdir)/test-libudev-sym.c: \ - $(srcdir)/libudev.sym \ - $(srcdir)/udev.h - $(generate-sym-test) - -nodist_test_libudev_sym_SOURCES = \ - test-libudev-sym.c -test_libudev_sym_CFLAGS = \ - $(AM_CFLAGS) \ - -Wno-deprecated-declarations -test_libudev_sym_LDADD = \ - libudev.la - -systemd.sed_files += libudev.pc - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/src/libudev.pc.in b/src/libudev/src/libudev.pc.in deleted file mode 100644 index a0f3f524e0..0000000000 --- a/src/libudev/src/libudev.pc.in +++ /dev/null @@ -1,17 +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. - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libudev -Description: Library to access udev device information -Version: @VERSION@ -Libs: -L${libdir} -ludev -Cflags: -I${includedir} diff --git a/src/libudev/src/libudev.sym b/src/libudev/src/libudev.sym deleted file mode 100644 index 76726fca77..0000000000 --- a/src/libudev/src/libudev.sym +++ /dev/null @@ -1,120 +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. -***/ - -LIBUDEV_183 { -global: - udev_device_get_action; - udev_device_get_devlinks_list_entry; - udev_device_get_devnode; - udev_device_get_devnum; - udev_device_get_devpath; - udev_device_get_devtype; - udev_device_get_driver; - udev_device_get_is_initialized; - udev_device_get_parent; - udev_device_get_parent_with_subsystem_devtype; - udev_device_get_properties_list_entry; - udev_device_get_property_value; - udev_device_get_seqnum; - udev_device_get_subsystem; - udev_device_get_sysattr_list_entry; - udev_device_get_sysattr_value; - udev_device_get_sysname; - udev_device_get_sysnum; - udev_device_get_syspath; - udev_device_get_tags_list_entry; - udev_device_get_udev; - udev_device_get_usec_since_initialized; - udev_device_has_tag; - udev_device_new_from_devnum; - udev_device_new_from_environment; - udev_device_new_from_subsystem_sysname; - udev_device_new_from_syspath; - udev_device_ref; - udev_device_unref; - udev_enumerate_add_match_is_initialized; - udev_enumerate_add_match_parent; - udev_enumerate_add_match_property; - udev_enumerate_add_match_subsystem; - udev_enumerate_add_match_sysattr; - udev_enumerate_add_match_sysname; - udev_enumerate_add_match_tag; - udev_enumerate_add_nomatch_subsystem; - udev_enumerate_add_nomatch_sysattr; - udev_enumerate_add_syspath; - udev_enumerate_get_list_entry; - udev_enumerate_get_udev; - udev_enumerate_new; - udev_enumerate_ref; - udev_enumerate_scan_devices; - udev_enumerate_scan_subsystems; - udev_enumerate_unref; - udev_get_log_priority; - udev_get_userdata; - udev_list_entry_get_by_name; - udev_list_entry_get_name; - udev_list_entry_get_next; - udev_list_entry_get_value; - udev_monitor_enable_receiving; - udev_monitor_filter_add_match_subsystem_devtype; - udev_monitor_filter_add_match_tag; - udev_monitor_filter_remove; - udev_monitor_filter_update; - udev_monitor_get_fd; - udev_monitor_get_udev; - udev_monitor_new_from_netlink; - udev_monitor_receive_device; - udev_monitor_ref; - udev_monitor_set_receive_buffer_size; - udev_monitor_unref; - udev_new; - udev_queue_get_kernel_seqnum; - udev_queue_get_queue_is_empty; - udev_queue_get_queued_list_entry; - udev_queue_get_seqnum_is_finished; - udev_queue_get_seqnum_sequence_is_finished; - udev_queue_get_udev; - udev_queue_get_udev_is_active; - udev_queue_get_udev_seqnum; - udev_queue_new; - udev_queue_ref; - udev_queue_unref; - udev_ref; - udev_set_log_fn; - udev_set_log_priority; - udev_set_userdata; - udev_unref; - udev_util_encode_string; -local: - *; -}; - -LIBUDEV_189 { -global: - udev_device_new_from_device_id; -} LIBUDEV_183; - -LIBUDEV_196 { -global: - udev_hwdb_new; - udev_hwdb_ref; - udev_hwdb_unref; - udev_hwdb_get_properties_list_entry; -} LIBUDEV_189; - -LIBUDEV_199 { -global: - udev_device_set_sysattr_value; -} LIBUDEV_196; - -LIBUDEV_215 { -global: - udev_queue_flush; - udev_queue_get_fd; -} LIBUDEV_199; -- cgit v1.2.3-54-g00ecf