chiark / gitweb /
Remove sd-path interface.
[elogind.git] / Makefile.am
index 78e0740..fd7035f 100644 (file)
@@ -1,24 +1,24 @@
 #  -*- Mode: makefile; indent-tabs-mode: t -*-
 #
-#  This file is part of systemd.
+#  This file is part of elogind.
 #
 #  Copyright 2010-2012 Lennart Poettering
 #  Copyright 2010-2012 Kay Sievers
 #  Copyright 2013 Zbigniew Jędrzejewski-Szmek
 #  Copyright 2013 David Strauss
 #
-#  systemd is free software; you can redistribute it and/or modify it
+#  elogind 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
+#  elogind 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 <http://www.gnu.org/licenses/>.
+#  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
@@ -38,71 +38,34 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBSYSTEMD_CURRENT=6
-LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=6
-
-# The following four libraries only exist for compatibility reasons,
-# their version info should not be bumped anymore
-LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=3
-LIBSYSTEMD_LOGIN_AGE=9
-
-LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=12
-LIBSYSTEMD_DAEMON_AGE=0
-
-LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=28
-LIBSYSTEMD_ID128_AGE=0
-
-LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=5
-LIBSYSTEMD_JOURNAL_AGE=11
+LIBELOGIND_CURRENT=11
+LIBELOGIND_REVISION=0
+LIBELOGIND_AGE=11
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
-dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
 pamlibdir=@pamlibdir@
 pamconfdir=@pamconfdir@
+pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
-varlogdir=$(localstatedir)/log
-systemdstatedir=$(localstatedir)/lib/systemd
-catalogstatedir=$(systemdstatedir)/catalog
-xinitrcdir=$(sysconfdir)/X11/xinit/xinitrc.d
 
 # Our own, non-special dirs
-pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(prefix)/lib/systemd/user
-userpresetdir=$(prefix)/lib/systemd/user-preset
-tmpfilesdir=$(prefix)/lib/tmpfiles.d
-sysusersdir=$(prefix)/lib/sysusers.d
-sysctldir=$(prefix)/lib/sysctl.d
-binfmtdir=$(prefix)/lib/binfmt.d
-modulesloaddir=$(prefix)/lib/modules-load.d
-networkdir=$(rootprefix)/lib/systemd/network
-pkgincludedir=$(includedir)/systemd
-systemgeneratordir=$(rootlibexecdir)/system-generators
-usergeneratordir=$(prefix)/lib/systemd/user-generators
-systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemsleepdir=$(rootlibexecdir)/system-sleep
-systemunitdir=$(rootprefix)/lib/systemd/system
-systempresetdir=$(rootprefix)/lib/systemd/system-preset
-udevrulesdir=$(rootprefix)/lib/udev/rules.d
-catalogdir=$(prefix)/lib/systemd/catalog
-kernelinstalldir = $(prefix)/lib/kernel/install.d
-factory_etcdir = $(prefix)/share/factory/etc
-factory_pamdir = $(prefix)/share/factory/etc/pam.d
-bootlibdir = $(prefix)/lib/systemd/boot/efi
+pkgsysconfdir=$(sysconfdir)/elogind
+pkgincludedir=$(includedir)/elogind
+udevrulesdir=@udevrulesdir@
+udevbindir=@udevbindir@
+udevlibexecdir=$(udevbindir)
+udevhomedir=$(udevlibexecdir)
+factory_pamdir = $(datadir)/factory/etc/pam.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/systemd
+rootlibexecdir=$(rootprefix)/lib/elogind
 
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -115,25 +78,19 @@ CLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
 noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
-include_HEADERS =
 noinst_DATA =
 pkgconfiglib_DATA =
-polkitpolicy_in_in_files =
 polkitpolicy_in_files =
 polkitpolicy_files =
+dist_udevrules_DATA =
+nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
-nodist_pkgsysconf_DATA =
-dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
-dist_systemunit_DATA_busnames =
-dist_sysusers_DATA =
 check_PROGRAMS =
 check_DATA =
 tests=
 manual_tests =
-TEST_EXTENSIONS = .py
-PY_LOG_COMPILER = $(PYTHON)
 if ENABLE_TESTS
 noinst_PROGRAMS = $(manual_tests) $(tests)
 TESTS = $(tests)
@@ -155,48 +112,32 @@ CLEANFILES = $(BUILT_SOURCES) \
        $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
        $(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
 
-# FIXME a different pkttyagent path...
-
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-       -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
-       -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-       -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-       -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-       -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-       -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-       -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
-       -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
-       -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
-       -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\" \
-       -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \
-       -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-       -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-       -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-       -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-       -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-       -DSYSTEMD_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
-       -DX_SERVER=\"$(bindir)/X\" \
+       -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
-       -DQUOTACHECK=\"$(QUOTACHECK)\" \
        -DKEXEC=\"$(KEXEC)\" \
        -DLIBDIR=\"$(libdir)\" \
        -DROOTLIBDIR=\"$(rootlibdir)\" \
        -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
        -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
        -I $(top_srcdir)/src \
-       -I $(top_builddir)/src/shared \
+       -I $(top_builddir)/src/basic \
+       -I $(top_srcdir)/src/basic \
        -I $(top_srcdir)/src/shared \
+       -I $(top_builddir)/src/shared \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/systemd \
        -I $(top_builddir)/src/core \
+       -I $(top_srcdir)/src/libudev \
+       -I $(top_srcdir)/src/udev \
        -I $(top_srcdir)/src/core \
-       -I $(top_srcdir)/src/libsystemd/sd-bus \
-       -I $(top_srcdir)/src/libsystemd/sd-event \
-       -I $(top_srcdir)/src/libsystemd/sd-device \
-       $(UDEV_CFLAGS) \
+       -I $(top_srcdir)/src/libelogind/sd-bus \
+       -I $(top_srcdir)/src/libelogind/sd-event \
+       -I $(top_srcdir)/src/libelogind/sd-login \
+       -I $(top_srcdir)/src/libelogind/sd-netlink \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -213,93 +154,12 @@ define move-to-rootlibdir
        fi
 endef
 
-INSTALL_DIRS =
-
-SHUTDOWN_TARGET_WANTS =
-LOCAL_FS_TARGET_WANTS =
-MULTI_USER_TARGET_WANTS =
-GRAPHICAL_TARGET_WANTS =
-RESCUE_TARGET_WANTS =
-SYSINIT_TARGET_WANTS =
-SOCKETS_TARGET_WANTS =
-BUSNAMES_TARGET_WANTS =
-TIMERS_TARGET_WANTS =
-USER_SOCKETS_TARGET_WANTS =
-USER_DEFAULT_TARGET_WANTS =
-USER_BUSNAMES_TARGET_WANTS =
-
-SYSTEM_UNIT_ALIASES =
-USER_UNIT_ALIASES =
-GENERAL_ALIASES =
-
-install-target-wants-hook:
-       what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(RESCUE_TARGET_WANTS)" && wants=rescue.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
-       what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
-
-install-busnames-target-wants-hook:
-       what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
-       what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
-
-define add-wants
-       [ -z "$$what" ] || ( \
-         dir=$(DESTDIR)$$dir/$$wants.wants && \
-         $(MKDIR_P) -m 0755 $$dir && \
-         cd $$dir && \
-         rm -f $$what && \
-         for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )
-endef
-
-install-directories-hook:
-       $(MKDIR_P) $(addprefix $(DESTDIR),$(INSTALL_DIRS))
-
-install-aliases-hook:
-       set -- $(SYSTEM_UNIT_ALIASES) && \
-               dir=$(systemunitdir) && $(install-aliases)
-       set -- $(USER_UNIT_ALIASES) && \
-               dir=$(userunitdir) && $(install-relative-aliases)
-       set -- $(GENERAL_ALIASES) && \
-               dir= && $(install-relative-aliases)
-
-define install-aliases
-       while [ -n "$$1" ]; do \
-               $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
-               rm -f $(DESTDIR)$$dir/$$2 && \
-               $(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \
-               shift 2 || exit $$?; \
-       done
-endef
-
-define install-relative-aliases
-       while [ -n "$$1" ]; do \
-               $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
-               rm -f $(DESTDIR)$$dir/$$2 && \
-               $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
-               shift 2 || exit $$?; \
-       done
-endef
-
 install-touch-usr-hook:
        touch -c $(DESTDIR)/$(prefix)
 
 INSTALL_EXEC_HOOKS += \
-       install-target-wants-hook \
-       install-directories-hook \
-       install-aliases-hook \
        install-touch-usr-hook
 
-if ENABLE_KDBUS
-INSTALL_EXEC_HOOKS += \
-       install-busnames-target-wants-hook
-endif
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -326,19 +186,12 @@ AM_V_RM_0 = @echo "  RM      " $@;
 rootbin_PROGRAMS =
 bin_PROGRAMS =
 rootlibexec_PROGRAMS =
-systemgenerator_PROGRAMS =
-dist_bashcompletion_DATA =
-dist_zshcompletion_DATA =
 
 dist_doc_DATA = \
        README \
        NEWS \
        LICENSE.LGPL2.1 \
-       LICENSE.GPL2 \
-       LICENSE.MIT \
-       src/libsystemd/sd-bus/PORTING-DBUS1 \
-       src/libsystemd/sd-bus/DIFFERENCES \
-       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
+       LICENSE.GPL2
 
 @INTLTOOL_POLICY_RULE@
 
@@ -383,368 +236,194 @@ noinst_DATA += \
 CLEANFILES += \
        docs/html/man
 
+if HAVE_PYTHON
+man/index.html: man/elogind.index.html
+       $(AM_V_LN)$(LN_S) -f elogind.index.html $@
+
+noinst_DATA += \
+       man/index.html
+
+CLEANFILES += \
+       man/index.html
+
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
+NON_INDEX_XML_FILES = $(filter-out man/elogind.index.xml,$(XML_FILES))
+SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/elogind.directives.xml,$(NON_INDEX_XML_FILES))}
+
+# This target should only be run manually. It recreates Makefile-man.am
+# file in the source directory based on all man/*.xml files. Run it after
+# adding, removing, or changing the conditional in a man page.
+update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
+       $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
+       $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
+               @echo "Makefile-man.am has been regenerated"
+
+man/elogind.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
+
+man/elogind.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
+
+CLEANFILES += \
+       man/elogind.index.xml \
+       man/elogind.directives.xml
+
+EXTRA_DIST += \
+       tools/make-man-rules.py
+
+endif
+
 endif
 
 EXTRA_DIST += \
-       $(XML_FILES) \
+       $(filter-out man/systemd.directives.xml,$(XML_FILES)) \
        $(HTML_FILES) \
        $(HTML_ALIAS) \
        $(man_MANS) \
-       tools/make-man-index.py \
-       tools/make-directive-index.py \
-       tools/xml_helper.py
+       $(NULL)
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libsystemd-shared.la
-
-libsystemd_shared_la_SOURCES = \
-       src/shared/capability.c \
-       src/shared/capability.h \
-       src/shared/linux/auto_dev-ioctl.h \
-       src/shared/ioprio.h \
-       src/shared/missing.h \
-       src/shared/initreq.h \
-       src/shared/securebits.h \
-       src/shared/special.h \
-       src/shared/list.h \
-       src/shared/unaligned.h \
-       src/shared/macro.h \
-       src/shared/def.h \
-       src/shared/sparse-endian.h \
-       src/shared/refcnt.h \
-       src/shared/udev-util.h \
-       src/shared/device-nodes.c \
-       src/shared/device-nodes.h \
-       src/shared/util.c \
-       src/shared/util.h \
-       src/shared/virt.c \
-       src/shared/virt.h \
-       src/shared/architecture.c \
-       src/shared/architecture.h \
-       src/shared/efivars.c \
-       src/shared/efivars.h \
-       src/shared/fstab-util.c \
-       src/shared/fstab-util.h \
-       src/shared/path-util.c \
-       src/shared/path-util.h \
-       src/shared/time-util.c \
-       src/shared/time-util.h \
-       src/shared/locale-util.c \
-       src/shared/locale-util.h \
-       src/shared/mempool.c \
-       src/shared/mempool.h \
-       src/shared/hashmap.c \
-       src/shared/hashmap.h \
-       src/shared/siphash24.c \
-       src/shared/siphash24.h \
-       src/shared/set.h \
-       src/shared/fdset.c \
-       src/shared/fdset.h \
-       src/shared/prioq.c \
-       src/shared/prioq.h \
+       libbasic.la
+
+libbasic_la_SOURCES = \
+       src/basic/missing.h \
+       src/basic/capability.c \
+       src/basic/capability.h \
+       src/basic/conf-files.c \
+       src/basic/conf-files.h \
+       src/basic/hostname-util.h \
+       src/basic/hostname-util.c \
+       src/basic/unit-name.c \
+       src/basic/unit-name.h \
+       src/basic/util.c \
+       src/basic/util.h \
+       src/basic/path-util.c \
+       src/basic/path-util.h \
+       src/basic/time-util.c \
+       src/basic/time-util.h \
+       src/basic/signal-util.c \
+       src/basic/signal-util.h \
+       src/basic/mempool.c \
+       src/basic/mempool.h \
+       src/basic/hashmap.c \
+       src/basic/hashmap.h \
+       src/basic/siphash24.c \
+       src/basic/siphash24.h \
+       src/basic/prioq.c \
+       src/basic/prioq.h \
+       src/basic/strv.c \
+       src/basic/strv.h \
+       src/basic/log.c \
+       src/basic/log.h \
+       src/basic/bus-label.c \
+       src/basic/bus-label.h \
+       src/basic/virt.c \
+       src/basic/virt.h \
+       src/basic/smack-util.c \
+       src/basic/smack-util.h \
+       src/basic/utf8.c \
+       src/basic/utf8.h \
+       src/basic/gunicode.c \
+       src/basic/gunicode.h \
+       src/basic/fileio.c \
+       src/basic/fileio.h \
+       src/basic/mkdir.c \
+       src/basic/mkdir.h \
+       src/basic/cgroup-util.c \
+       src/basic/cgroup-util.h \
+       src/basic/errno-list.c \
+       src/basic/errno-list.h \
+       src/basic/terminal-util.c \
+       src/basic/terminal-util.h \
+       src/basic/login-util.h \
+       src/basic/login-util.c \
+       src/basic/audit.c \
+       src/basic/audit.h \
+       src/basic/memfd-util.c \
+       src/basic/memfd-util.h \
+       src/basic/process-util.c \
+       src/basic/process-util.h \
+       src/basic/random-util.c \
+       src/basic/random-util.h \
+       src/basic/verbs.c \
+       src/basic/verbs.h \
+       src/basic/label.c \
+       src/basic/label.h \
+       src/basic/selinux-util.c \
+       src/basic/selinux-util.h \
+       src/basic/mkdir-label.c \
+       src/basic/fileio-label.c \
+       src/basic/fileio-label.h \
+       src/basic/rm-rf.c \
+       src/basic/rm-rf.h \
+       src/basic/copy.c \
+       src/basic/copy.h
+
+nodist_libbasic_la_SOURCES = \
+       src/basic/errno-from-name.h \
+       src/basic/errno-to-name.h
+
+libbasic_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SELINUX_CFLAGS) \
+       $(CAP_CFLAGS) \
+       -pthread
+
+libbasic_la_LIBADD = \
+       $(SELINUX_LIBS) \
+       $(CAP_LIBS) \
+       -ldl \
+       -lrt \
+       -lm
+
+# -----------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libshared.la
+
+libshared_la_SOURCES = \
        src/shared/sleep-config.c \
        src/shared/sleep-config.h \
-       src/shared/strv.c \
-       src/shared/strv.h \
-       src/shared/env-util.c \
-       src/shared/env-util.h \
-       src/shared/strbuf.c \
-       src/shared/strbuf.h \
-       src/shared/strxcpyx.c \
-       src/shared/strxcpyx.h \
        src/shared/conf-parser.c \
        src/shared/conf-parser.h \
-       src/shared/log.c \
-       src/shared/log.h \
-       src/shared/ratelimit.h \
-       src/shared/ratelimit.c \
-       src/shared/exit-status.c \
-       src/shared/exit-status.h \
-       src/shared/utf8.c \
-       src/shared/utf8.h \
-       src/shared/gunicode.c \
-       src/shared/gunicode.h \
        src/shared/pager.c \
        src/shared/pager.h \
-       src/shared/socket-util.c \
-       src/shared/socket-util.h \
-       src/shared/in-addr-util.c \
-       src/shared/in-addr-util.h \
-       src/shared/ether-addr-util.h \
-       src/shared/conf-files.c \
-       src/shared/conf-files.h \
-       src/shared/cgroup-util.c \
-       src/shared/cgroup-util.h \
-       src/shared/cgroup-show.c \
-       src/shared/cgroup-show.h \
-       src/shared/unit-name.c \
-       src/shared/unit-name.h \
-       src/shared/watchdog.c \
-       src/shared/watchdog.h \
-       src/shared/replace-var.c \
-       src/shared/replace-var.h \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
-       src/shared/clock-util.c \
-       src/shared/clock-util.h \
-       src/shared/calendarspec.c \
-       src/shared/calendarspec.h \
-       src/shared/fileio.c \
-       src/shared/fileio.h \
-       src/shared/output-mode.h \
-       src/shared/MurmurHash2.c \
-       src/shared/MurmurHash2.h \
-       src/shared/acpi-fpdt.h \
-       src/shared/acpi-fpdt.c \
-       src/shared/boot-timestamps.h \
-       src/shared/boot-timestamps.c \
-       src/shared/mkdir.c \
-       src/shared/mkdir.h \
-       src/shared/smack-util.c \
-       src/shared/smack-util.h \
-       src/shared/apparmor-util.c \
-       src/shared/apparmor-util.h \
-       src/shared/ima-util.c \
-       src/shared/ima-util.h \
-       src/shared/ptyfwd.c \
-       src/shared/ptyfwd.h \
-       src/shared/errno-list.c \
-       src/shared/errno-list.h \
-       src/shared/af-list.c \
-       src/shared/af-list.h \
-       src/shared/arphrd-list.c \
-       src/shared/arphrd-list.h \
-       src/shared/cap-list.c \
-       src/shared/cap-list.h \
-       src/shared/audit.c \
-       src/shared/audit.h \
-       src/shared/xml.c \
-       src/shared/xml.h \
-       src/shared/json.c \
-       src/shared/json.h \
-       src/shared/selinux-util.c \
-       src/shared/selinux-util.h \
-       src/shared/smack-util.c \
-       src/shared/smack-util.h \
-       src/shared/label.c \
-       src/shared/label.h \
-       src/shared/socket-label.c \
-       src/shared/mkdir-label.c \
-       src/shared/fileio-label.h \
-       src/shared/fileio-label.c \
-       src/shared/bus-label.c \
-       src/shared/bus-label.h \
-       src/shared/gpt.h \
-       src/shared/clean-ipc.h \
        src/shared/clean-ipc.c \
-       src/shared/login-shared.c \
-       src/shared/login-shared.h \
-       src/shared/ring.c \
-       src/shared/ring.h \
-       src/shared/barrier.c \
-       src/shared/barrier.h \
-       src/shared/pty.c \
-       src/shared/pty.h \
-       src/shared/async.c \
-       src/shared/async.h \
-       src/shared/base-filesystem.c \
-       src/shared/base-filesystem.h \
-       src/shared/memfd-util.c \
-       src/shared/memfd-util.h \
-       src/shared/uid-range.c \
-       src/shared/uid-range.h \
-       src/shared/nss-util.h \
-       src/shared/verbs.c \
-       src/shared/verbs.h \
-       src/shared/sigbus.c \
-       src/shared/sigbus.h \
-       src/shared/build.h \
-       src/shared/import-util.c \
-       src/shared/import-util.h \
-       src/shared/sysctl-util.c \
-       src/shared/sysctl-util.h
-
-nodist_libsystemd_shared_la_SOURCES = \
-       src/shared/errno-from-name.h \
-       src/shared/errno-to-name.h \
-       src/shared/af-from-name.h \
-       src/shared/af-to-name.h \
-       src/shared/arphrd-from-name.h \
-       src/shared/arphrd-to-name.h \
-       src/shared/cap-from-name.h \
-       src/shared/cap-to-name.h
-
-libsystemd_shared_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS) \
-       $(SECCOMP_CFLAGS) \
-       -pthread
-
-libsystemd_shared_la_LIBADD = \
-       $(CAP_LIBS) \
-       -lm
+       src/shared/clean-ipc.h \
+       src/shared/cgroup-show.c \
+       src/shared/cgroup-show.h \
+       src/shared/utmp-wtmp.h \
+       src/shared/bus-util.c \
+       src/shared/bus-util.h
 
-# ------------------------------------------------------------------------------
 if HAVE_ACL
-noinst_LTLIBRARIES += \
-       libsystemd-acl.la
-
-libsystemd_acl_la_SOURCES = \
+libshared_la_SOURCES += \
        src/shared/acl-util.c \
        src/shared/acl-util.h
-
-libsystemd_acl_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(ACL_CFLAGS)
-
-libsystemd_acl_la_LIBADD = \
-       $(ACL_LIBS)
 endif
 
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-core.la
-
-libsystemd_core_la_SOURCES = \
-       src/core/unit.c \
-       src/core/unit.h \
-       src/core/unit-printf.c \
-       src/core/unit-printf.h \
-       src/core/job.c \
-       src/core/job.h \
-       src/core/manager.c \
-       src/core/manager.h \
-       src/core/transaction.c \
-       src/core/transaction.h \
-       src/core/load-fragment.c \
-       src/core/load-fragment.h \
-       src/core/service.c \
-       src/core/service.h \
-       src/core/socket.c \
-       src/core/socket.h \
-       src/core/busname.c \
-       src/core/busname.h \
-       src/core/bus-endpoint.c \
-       src/core/bus-endpoint.h \
-       src/core/bus-policy.c \
-       src/core/bus-policy.h \
-       src/core/target.c \
-       src/core/target.h \
-       src/core/snapshot.c \
-       src/core/snapshot.h \
-       src/core/device.c \
-       src/core/device.h \
-       src/core/swap.c \
-       src/core/swap.h \
-       src/core/timer.c \
-       src/core/timer.h \
-       src/core/path.c \
-       src/core/path.h \
-       src/core/slice.c \
-       src/core/slice.h \
-       src/core/scope.c \
-       src/core/scope.h \
-       src/core/load-dropin.c \
-       src/core/load-dropin.h \
-       src/core/execute.c \
-       src/core/execute.h \
-       src/core/kill.c \
-       src/core/kill.h \
-       src/core/dbus.c \
-       src/core/dbus.h \
-       src/core/dbus-manager.c \
-       src/core/dbus-manager.h \
-       src/core/dbus-unit.c \
-       src/core/dbus-unit.h \
-       src/core/dbus-job.c \
-       src/core/dbus-job.h \
-       src/core/dbus-service.c \
-       src/core/dbus-service.h \
-       src/core/dbus-socket.c \
-       src/core/dbus-socket.h \
-       src/core/dbus-busname.c \
-       src/core/dbus-busname.h \
-       src/core/dbus-target.c \
-       src/core/dbus-target.h \
-       src/core/dbus-snapshot.c \
-       src/core/dbus-snapshot.h \
-       src/core/dbus-device.c \
-       src/core/dbus-device.h \
-       src/core/dbus-swap.c \
-       src/core/dbus-swap.h \
-       src/core/dbus-timer.c \
-       src/core/dbus-timer.h \
-       src/core/dbus-path.c \
-       src/core/dbus-path.h \
-       src/core/dbus-slice.c \
-       src/core/dbus-slice.h \
-       src/core/dbus-scope.c \
-       src/core/dbus-scope.h \
-       src/core/dbus-execute.c \
-       src/core/dbus-execute.h \
-       src/core/dbus-kill.c \
-       src/core/dbus-kill.h \
-       src/core/dbus-cgroup.c \
-       src/core/dbus-cgroup.h \
-       src/core/cgroup.c \
-       src/core/cgroup.h \
-       src/core/selinux-access.c \
-       src/core/selinux-access.h \
-       src/core/selinux-setup.c \
-       src/core/selinux-setup.h \
-       src/core/smack-setup.c \
-       src/core/smack-setup.h \
-       src/core/ima-setup.c \
-       src/core/ima-setup.h \
-       src/core/locale-setup.h \
-       src/core/locale-setup.c \
-       src/core/hostname-setup.c \
-       src/core/hostname-setup.h \
-       src/core/machine-id-setup.c \
-       src/core/machine-id-setup.h \
-       src/core/kmod-setup.c \
-       src/core/kmod-setup.h \
-       src/core/namespace.c \
-       src/core/namespace.h \
-       src/core/killall.h \
-       src/core/killall.c \
-       src/core/audit-fd.c \
-       src/core/audit-fd.h \
-       src/core/show-status.c \
-       src/core/show-status.h \
-       src/core/failure-action.c \
-       src/core/failure-action.h
-
-nodist_libsystemd_core_la_SOURCES = \
-       src/core/load-fragment-gperf.c \
-       src/core/load-fragment-gperf-nulstr.c
-
-libsystemd_core_la_CFLAGS = \
+libshared_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(PAM_CFLAGS) \
-       -pthread
-
-libsystemd_core_la_LIBADD = \
-       libsystemd-shared.la \
-       $(PAM_LIBS)
-
-src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
+       $(ACL_CFLAGS) \
+       $(LIBIDN_CFLAGS) \
+       $(SECCOMP_CFLAGS)
 
-gperf_gperf_m4_sources = \
-       src/core/load-fragment-gperf.gperf.m4
+libshared_la_LIBADD = \
+       libelogind-internal.la \
+       $(UDEV_LIBS) \
+       $(ACL_LIBS) \
+       $(LIBIDN_LIBS) \
+       $(SECCOMP_LIBS)
 
 gperf_txt_sources = \
-       src/shared/errno-list.txt \
-       src/shared/af-list.txt \
-       src/shared/arphrd-list.txt \
-       src/shared/cap-list.txt
+       src/basic/errno-list.txt
 
 BUILT_SOURCES += \
        $(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf.c) \
-       $(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf-nulstr.c) \
        $(gperf_gperf_sources:-gperf.gperf=-gperf.c) \
        $(gperf_txt_sources:-list.txt=-from-name.h) \
        $(gperf_txt_sources:-list.txt=-to-name.h)
@@ -756,62 +435,30 @@ DISTCLEANFILES = \
 
 EXTRA_DIST += \
        $(gperf_gperf_m4_sources) \
-       $(gperf_gperf_sources) \
-       $(gperf_txt_sources:-list.txt=-from-name.gperf)
+       $(gperf_gperf_sources)
 
 CLEANFILES += \
        $(gperf_txt_sources)
 
 %-from-name.gperf: %-list.txt
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
 
 %-from-name.h: %-from-name.gperf
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@
 
 
-src/shared/errno-list.txt:
+src/basic/errno-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
 
-src/shared/errno-to-name.h: src/shared/errno-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-
-src/shared/af-list.txt:
+src/basic/errno-to-name.h: src/basic/errno-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
-
-src/shared/af-to-name.h: src/shared/af-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-
-src/shared/arphrd-list.txt:
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
-
-src/shared/arphrd-to-name.h: src/shared/arphrd-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-src/shared/arphrd-from-name.gperf: src/shared/arphrd-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
-
-
-src/shared/cap-list.txt:
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
-
-src/shared/cap-to-name.h: src/shared/cap-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
-
-src/shared/cap-from-name.gperf: src/shared/cap-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
-src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
-       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
 # ------------------------------------------------------------------------------
-dist_factory_etc_DATA = \
-       factory/etc/nsswitch.conf
 
 if HAVE_PAM
 dist_factory_pam_DATA = \
@@ -820,137 +467,126 @@ dist_factory_pam_DATA = \
 endif
 
 # ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-internal.la
-
-libsystemd_internal_la_SOURCES = \
+libelogind_internal_la_SOURCES = \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
-       src/systemd/sd-utf8.h \
        src/systemd/sd-event.h \
-       src/systemd/sd-rtnl.h \
-       src/systemd/sd-resolve.h \
+       src/systemd/sd-netlink.h \
        src/systemd/sd-login.h \
        src/systemd/sd-id128.h \
        src/systemd/sd-daemon.h \
-       src/systemd/sd-path.h \
-       src/systemd/sd-network.h \
-       src/systemd/sd-device.h \
-       src/libsystemd/sd-bus/sd-bus.c \
-       src/libsystemd/sd-bus/bus-control.c \
-       src/libsystemd/sd-bus/bus-control.h \
-       src/libsystemd/sd-bus/bus-error.c \
-       src/libsystemd/sd-bus/bus-error.h \
-       src/libsystemd/sd-bus/bus-common-errors.h \
-       src/libsystemd/sd-bus/bus-common-errors.c \
-       src/libsystemd/sd-bus/bus-internal.c \
-       src/libsystemd/sd-bus/bus-internal.h \
-       src/libsystemd/sd-bus/bus-socket.c \
-       src/libsystemd/sd-bus/bus-socket.h \
-       src/libsystemd/sd-bus/bus-kernel.c \
-       src/libsystemd/sd-bus/bus-kernel.h \
-       src/libsystemd/sd-bus/bus-container.c \
-       src/libsystemd/sd-bus/bus-container.h \
-       src/libsystemd/sd-bus/bus-message.c \
-       src/libsystemd/sd-bus/bus-message.h \
-       src/libsystemd/sd-bus/bus-creds.c \
-       src/libsystemd/sd-bus/bus-creds.h \
-       src/libsystemd/sd-bus/bus-signature.c \
-       src/libsystemd/sd-bus/bus-signature.h \
-       src/libsystemd/sd-bus/bus-type.c \
-       src/libsystemd/sd-bus/bus-type.h \
-       src/libsystemd/sd-bus/bus-match.c \
-       src/libsystemd/sd-bus/bus-match.h \
-       src/libsystemd/sd-bus/bus-bloom.c \
-       src/libsystemd/sd-bus/bus-bloom.h \
-       src/libsystemd/sd-bus/bus-introspect.c \
-       src/libsystemd/sd-bus/bus-introspect.h \
-       src/libsystemd/sd-bus/bus-objects.c \
-       src/libsystemd/sd-bus/bus-objects.h \
-       src/libsystemd/sd-bus/bus-gvariant.c \
-       src/libsystemd/sd-bus/bus-gvariant.h \
-       src/libsystemd/sd-bus/bus-convenience.c \
-       src/libsystemd/sd-bus/bus-track.c \
-       src/libsystemd/sd-bus/bus-track.h \
-       src/libsystemd/sd-bus/bus-util.c \
-       src/libsystemd/sd-bus/bus-util.h \
-       src/libsystemd/sd-bus/bus-slot.c \
-       src/libsystemd/sd-bus/bus-slot.h \
-       src/libsystemd/sd-bus/bus-protocol.h \
-       src/libsystemd/sd-bus/kdbus.h \
-       src/libsystemd/sd-utf8/sd-utf8.c \
-       src/libsystemd/sd-event/sd-event.c \
-       src/libsystemd/sd-event/event-util.h \
-       src/libsystemd/sd-rtnl/sd-rtnl.c \
-       src/libsystemd/sd-rtnl/rtnl-internal.h \
-       src/libsystemd/sd-rtnl/rtnl-message.c \
-       src/libsystemd/sd-rtnl/rtnl-types.h \
-       src/libsystemd/sd-rtnl/rtnl-types.c \
-       src/libsystemd/sd-rtnl/rtnl-util.h \
-       src/libsystemd/sd-rtnl/rtnl-util.c \
-       src/libsystemd/sd-rtnl/local-addresses.h \
-       src/libsystemd/sd-rtnl/local-addresses.c \
-       src/libsystemd/sd-id128/sd-id128.c \
-       src/libsystemd/sd-daemon/sd-daemon.c \
-       src/libsystemd/sd-login/sd-login.c \
-       src/libsystemd/sd-path/sd-path.c \
-       src/libsystemd/sd-network/sd-network.c \
-       src/libsystemd/sd-network/network-util.h \
-       src/libsystemd/sd-network/network-util.c \
-       src/libsystemd/sd-device/device-internal.h \
-       src/libsystemd/sd-device/device-util.h \
-       src/libsystemd/sd-device/sd-device.c \
-       src/libsystemd/sd-device/device-private.c \
-       src/libsystemd/sd-device/device-private.h
-
-nodist_libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym
-
-libsystemd_internal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
+       src/libelogind/libelogind.sym \
+       src/libelogind/sd-bus/sd-bus.c \
+       src/libelogind/sd-bus/bus-control.c \
+       src/libelogind/sd-bus/bus-control.h \
+       src/libelogind/sd-bus/bus-error.c \
+       src/libelogind/sd-bus/bus-error.h \
+       src/libelogind/sd-bus/bus-common-errors.h \
+       src/libelogind/sd-bus/bus-common-errors.c \
+       src/libelogind/sd-bus/bus-internal.c \
+       src/libelogind/sd-bus/bus-internal.h \
+       src/libelogind/sd-bus/bus-socket.c \
+       src/libelogind/sd-bus/bus-socket.h \
+       src/libelogind/sd-bus/bus-kernel.c \
+       src/libelogind/sd-bus/bus-kernel.h \
+       src/libelogind/sd-bus/bus-container.c \
+       src/libelogind/sd-bus/bus-container.h \
+       src/libelogind/sd-bus/bus-message.c \
+       src/libelogind/sd-bus/bus-message.h \
+       src/libelogind/sd-bus/bus-creds.c \
+       src/libelogind/sd-bus/bus-creds.h \
+       src/libelogind/sd-bus/bus-signature.c \
+       src/libelogind/sd-bus/bus-signature.h \
+       src/libelogind/sd-bus/bus-type.c \
+       src/libelogind/sd-bus/bus-type.h \
+       src/libelogind/sd-bus/bus-match.c \
+       src/libelogind/sd-bus/bus-match.h \
+       src/libelogind/sd-bus/bus-bloom.c \
+       src/libelogind/sd-bus/bus-bloom.h \
+       src/libelogind/sd-bus/bus-introspect.c \
+       src/libelogind/sd-bus/bus-introspect.h \
+       src/libelogind/sd-bus/bus-objects.c \
+       src/libelogind/sd-bus/bus-objects.h \
+       src/libelogind/sd-bus/bus-gvariant.c \
+       src/libelogind/sd-bus/bus-gvariant.h \
+       src/libelogind/sd-bus/bus-convenience.c \
+       src/libelogind/sd-bus/bus-track.c \
+       src/libelogind/sd-bus/bus-track.h \
+       src/libelogind/sd-bus/bus-slot.c \
+       src/libelogind/sd-bus/bus-slot.h \
+       src/libelogind/sd-bus/bus-protocol.h \
+       src/libelogind/sd-event/sd-event.c \
+       src/libelogind/sd-event/event-util.h \
+       src/libelogind/sd-id128/sd-id128.c \
+       src/libelogind/sd-daemon/sd-daemon.c \
+       src/libelogind/sd-login/sd-login.c
+
+libelogind_internal_la_LIBADD = \
+       libbasic.la \
+       -lresolv
 
-BUILT_SOURCES += \
-       src/libsystemd/libsystemd.sym
+noinst_LTLIBRARIES += \
+       libelogind-internal.la
+
+EXTRA_DIST += \
+       src/libelogind/libelogind.pc.in \
+       src/libelogind/sd-bus/DIFFERENCES \
+       src/libelogind/sd-bus/GVARIANT-SERIALIZATION
 
+libelogind_la_SOURCES = \
+       $(libelogind_internal_la_SOURCES)
 
-libsystemd_internal_la_LIBADD = \
-       $(RT_LIBS) \
-       libsystemd-shared.la
+nodist_libelogind_la_SOURCES = \
+       $(nodist_libelogind_internal_la_SOURCES)
 
-libsystemd_internal_la_LDFLAGS = \
+libelogind_la_CFLAGS = \
+       $(libelogind_internal_la_CFLAGS)
+
+libelogind_la_LDFLAGS = \
        $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-       -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
+       -version-info $(LIBELOGIND_CURRENT):$(LIBELOGIND_REVISION):$(LIBELOGIND_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libelogind/libelogind.sym
+
+libelogind_la_LIBADD = \
+       $(libelogind_internal_la_LIBADD)
 
-libsystemd-install-hook:
-       libname=libsystemd.so && $(move-to-rootlibdir)
+libelogind-install-hook:
+       libname=libelogind.so && $(move-to-rootlibdir)
 
-libsystemd-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
+libelogind-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libelogind.so*
 
-INSTALL_EXEC_HOOKS += libsystemd-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+INSTALL_EXEC_HOOKS += libelogind-install-hook
+UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
 
 pkgconfiglib_DATA += \
-       src/libsystemd/libsystemd.pc
+       src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
-       src/systemd/sd-login.h
+       src/systemd/sd-bus.h \
+       src/systemd/sd-bus-protocol.h \
+       src/systemd/sd-bus-vtable.h \
+       src/systemd/sd-event.h \
+       src/systemd/sd-login.h \
+       src/systemd/sd-id128.h \
+       src/systemd/sd-daemon.h
+
+lib_LTLIBRARIES += \
+       libelogind.la
 
 # ------------------------------------------------------------------------------
-systemd_logind_SOURCES = \
+elogind_SOURCES = \
        src/login/logind.c \
        src/login/logind.h
 
-nodist_systemd_logind_SOURCES = \
+nodist_elogind_SOURCES = \
        src/login/logind-gperf.c
 
-systemd_logind_LDADD = \
-       libsystemd-logind-core.la
+elogind_LDADD = \
+       libelogind-core.la
 
-libsystemd_logind_core_la_SOURCES = \
+libelogind_core_la_SOURCES = \
        src/login/logind-core.c \
        src/login/logind-device.c \
        src/login/logind-device.h \
@@ -972,26 +608,22 @@ libsystemd_logind_core_la_SOURCES = \
        src/login/logind-session-dbus.c \
        src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
+       src/login/logind-utmp.c \
        src/login/logind-acl.h
 
-libsystemd_logind_core_la_LIBADD = \
-       $(UDEV_LIBS) \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+libelogind_core_la_LIBADD = \
+       libshared.la
 
 if HAVE_ACL
-libsystemd_logind_core_la_SOURCES += \
+libelogind_core_la_SOURCES += \
        src/login/logind-acl.c
-
-libsystemd_logind_core_la_LIBADD += \
-       libsystemd-acl.la
 endif
 
 noinst_LTLIBRARIES += \
-       libsystemd-logind-core.la
+       libelogind-core.la
 
 rootlibexec_PROGRAMS += \
-       systemd-logind
+       elogind
 
 loginctl_SOURCES = \
        src/login/loginctl.c \
@@ -999,56 +631,54 @@ loginctl_SOURCES = \
        src/login/sysfs-show.c
 
 loginctl_LDADD = \
-       $(UDEV_LIBS) \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
 
 rootbin_PROGRAMS += \
        loginctl
 
-dist_bashcompletion_DATA += \
+if ENABLE_BASH_COMPLETION
+dist_bashcompletion_DATA = \
        shell-completion/bash/loginctl
+endif
 
-dist_zshcompletion_DATA += \
+if ENABLE_ZSH_COMPLETION
+dist_zshcompletion_DATA = \
        shell-completion/zsh/_loginctl \
-       shell-completion/zsh/_systemd-inhibit
+       shell-completion/zsh/_elogind-inhibit
+endif
 
-systemd_inhibit_SOURCES = \
+elogind_inhibit_SOURCES = \
        src/login/inhibit.c
 
-systemd_inhibit_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+elogind_inhibit_LDADD = \
+       libshared.la
 
 rootbin_PROGRAMS += \
-       systemd-inhibit
+       elogind-inhibit
 
 test_login_SOURCES = \
-       src/libsystemd/sd-login/test-login.c
+       src/libelogind/sd-login/test-login.c
 
 test_login_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
 
 test_login_shared_SOURCES = \
        src/login/test-login-shared.c
 
 test_login_shared_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
 
 test_inhibit_SOURCES = \
        src/login/test-inhibit.c
 
 test_inhibit_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
+       libshared.la
 
 test_login_tables_SOURCES = \
        src/login/test-login-tables.c
 
 test_login_tables_LDADD = \
-       libsystemd-logind-core.la
+       libelogind-core.la
 
 manual_tests += \
        test-login \
@@ -1059,33 +689,31 @@ tests += \
        test-login-shared
 
 if HAVE_PAM
-pam_systemd_la_SOURCES = \
-       src/login/pam_systemd.sym \
-       src/login/pam_systemd.c
+pam_elogind_la_SOURCES = \
+       src/login/pam_elogind.sym \
+       src/login/pam_elogind.c
 
-pam_systemd_la_CFLAGS = \
+pam_elogind_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(PAM_CFLAGS) \
-       -fvisibility=hidden
+       $(PAM_CFLAGS)
 
-pam_systemd_la_LDFLAGS = \
+pam_elogind_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -module \
        -export-dynamic \
        -avoid-version \
        -shared \
-       -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym
+       -Wl,--version-script=$(top_srcdir)/src/login/pam_elogind.sym
 
-pam_systemd_la_LIBADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
+pam_elogind_la_LIBADD = \
+       libshared.la \
        $(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
-       pam_systemd.la
+       pam_elogind.la
 
 dist_pamconf_DATA = \
-       src/login/systemd-user
+       src/login/elogind-user
 
 endif
 
@@ -1096,22 +724,16 @@ dist_dbuspolicy_DATA += \
        src/login/org.freedesktop.login1.conf
 
 dist_pkgsysconf_DATA += \
-       src/login/logind.conf
+       src/login/elogind.conf
 
 polkitpolicy_files += \
        src/login/org.freedesktop.login1.policy
 
-INSTALL_DIRS += \
-       $(systemdstatedir)
-
-SYSTEM_UNIT_ALIASES += \
-       systemd-logind.service dbus-org.freedesktop.login1.service
-
-dist_udevrules_DATA = \
+dist_udevrules_DATA += \
        src/login/70-uaccess.rules \
        src/login/70-power-switch.rules
 
-nodist_udevrules_DATA = \
+nodist_udevrules_DATA += \
        src/login/71-seat.rules \
        src/login/73-seat-late.rules
 
@@ -1123,43 +745,19 @@ gperf_gperf_sources = \
 
 EXTRA_DIST += \
        src/login/71-seat.rules.in \
-       src/login/73-seat-late.rules.in \
-       units/systemd-logind.service.in
-
-pkgconfiglib_DATA += \
-       src/compat-libs/libsystemd-login.pc
-
-EXTRA_DIST += \
-       src/compat-libs/libsystemd-login.pc.in
+       src/login/73-seat-late.rules.in
 
 # ------------------------------------------------------------------------------
 substitutions = \
        '|rootlibexecdir=$(rootlibexecdir)|' \
        '|rootbindir=$(rootbindir)|' \
        '|bindir=$(bindir)|' \
-       '|SYSTEMCTL=$(rootbindir)/systemctl|' \
-       '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
        '|pkgsysconfdir=$(pkgsysconfdir)|' \
-       '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \
-       '|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \
        '|pkgdatadir=$(pkgdatadir)|' \
-       '|systemunitdir=$(systemunitdir)|' \
-       '|userunitdir=$(userunitdir)|' \
-       '|systempresetdir=$(systempresetdir)|' \
-       '|userpresetdir=$(userpresetdir)|' \
        '|udevrulesdir=$(udevrulesdir)|' \
-       '|catalogdir=$(catalogdir)|' \
-       '|tmpfilesdir=$(tmpfilesdir)|' \
-       '|sysusersdir=$(sysusersdir)|' \
-       '|sysctldir=$(sysctldir)|' \
-       '|systemgeneratordir=$(systemgeneratordir)|' \
-       '|usergeneratordir=$(usergeneratordir)|' \
-       '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
-       '|RANDOM_SEED_DIR=$(localstatedir)/lib/systemd/|' \
-       '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \
        '|prefix=$(prefix)|' \
        '|exec_prefix=$(exec_prefix)|' \
        '|libdir=$(libdir)|' \
@@ -1167,38 +765,17 @@ substitutions = \
        '|VERSION=$(VERSION)|' \
        '|rootprefix=$(rootprefix)|' \
        '|udevlibexecdir=$(udevlibexecdir)|' \
-       '|SUSHELL=$(SUSHELL)|' \
-       '|SULOGIN=$(SULOGIN)|' \
-       '|DEBUGTTY=$(DEBUGTTY)|' \
        '|KILL=$(KILL)|' \
-       '|KMOD=$(KMOD)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
-       '|QUOTAON=$(QUOTAON)|' \
-       '|QUOTACHECK=$(QUOTACHECK)|' \
-       '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \
-       '|VARLOGDIR=$(varlogdir)|' \
-       '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
-       '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
-       '|PYTHON=$(PYTHON)|' \
-       '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
-       '|NTP_SERVERS=$(NTP_SERVERS)|' \
-       '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
-       '|TTY_GID=$(TTY_GID)|' \
-       '|systemsleepdir=$(systemsleepdir)|' \
-       '|systemshutdowndir=$(systemshutdowndir)|' \
-       '|binfmtdir=$(binfmtdir)|' \
-       '|modulesloaddir=$(modulesloaddir)|'
+       '|TTY_GID=$(TTY_GID)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
                < $< > $@
 
-units/%: units/%.in
-       $(SED_PROCESS)
-
 man/%: man/%.in
        $(SED_PROCESS)
 
@@ -1211,12 +788,6 @@ sysctl.d/%: sysctl.d/%.in
 %.conf: %.conf.in
        $(SED_PROCESS)
 
-src/core/macros.%: src/core/macros.%.in
-       $(SED_PROCESS)
-
-src/%.policy.in: src/%.policy.in.in
-       $(SED_PROCESS)
-
 shell-completion/%: shell-completion/%.in
        $(SED_PROCESS)
 
@@ -1257,13 +828,11 @@ units/user/%: units/user/%.m4
 
 if ENABLE_POLKIT
 nodist_polkitpolicy_DATA = \
-       $(polkitpolicy_files) \
-       $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+       $(polkitpolicy_files)
 endif
 
 EXTRA_DIST += \
-       $(polkitpolicy_in_files) \
-       $(polkitpolicy_in_in_files)
+       $(polkitpolicy_in_files)
 
 # ------------------------------------------------------------------------------
 if ENABLE_MANPAGES
@@ -1273,7 +842,7 @@ man/custom-entities.ent: configure.ac
         printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \
         > $@ # '
 
-DISTCLEANFILES += \
+CLEANFILES += \
        man/custom-entities.ent
 
 XSLTPROC_FLAGS = \
@@ -1283,7 +852,7 @@ XSLTPROC_FLAGS = \
        --stringparam funcsynopsis.style ansi \
        --stringparam man.authors.section.enabled 0 \
        --stringparam man.copyright.section.enabled 0 \
-       --stringparam systemd.version $(VERSION) \
+       --stringparam elogind.version $(VERSION) \
        --path '$(builddir)/man:$(srcdir)/man'
 
 XSLTPROC_PROCESS_MAN = \
@@ -1330,39 +899,29 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
 clean-local: $(CLEAN_LOCAL_HOOKS)
        rm -rf $(abs_srcdir)/install-tree
+       rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
+             $(abs_srcdir)/hwdb/iab.txt
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
-       --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
        --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
        --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
        --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
        --with-rootprefix=$$dc_install_base \
-       --disable-split-usr \
-       --enable-kdbus \
        --enable-compat-libs
 
+if ENABLE_SPLIT_USR
 DISTCHECK_CONFIGURE_FLAGS += \
-       --with-sysvinit-path= \
-       --with-sysvrcnd-path=
-
-if ENABLE_GTK_DOC
+       --enable-split-usr
+else
 DISTCHECK_CONFIGURE_FLAGS += \
-       --enable-gtk-doc
+       --disable-split-usr
 endif
 
-#
-# Require python when making dist
-#
 .PHONY: dist-check-compat-libs dist-check-help
-
 dist-check-compat-libs:
-if !ENABLE_COMPAT_LIBS
-       @echo "*** compat-libs must be enabled in order to make dist"
-       @false
-endif
 
 dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
@@ -1372,4 +931,117 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
                exit 1;                                                        \
             fi; done
 
-dist: dist-check-python dist-check-compat-libs
+dist: dist-check-compat-libs
+
+.PHONY: git-tag
+git-tag:
+       git tag -s "v$(VERSION)" -m "elogind $(VERSION)"
+
+.PHONY: install-tree
+install-tree: all
+       rm -rf $(abs_srcdir)/install-tree
+       $(MAKE) install DESTDIR=$(abs_srcdir)/install-tree
+       tree $(abs_srcdir)/install-tree
+
+# Let's run all tests of the test suite, but under valgrind. Let's
+# exclude the one perl script we have in there
+.PHONY: valgrind-tests
+valgrind-tests: $(TESTS)
+       $(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
+               if file $$f | grep -q shell; then \
+               echo -e "$${x}Skipping non-binary $$f"; else \
+               echo -e "$${x}Running $$f"; \
+               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+               x="\n\n"; \
+       done
+
+exported-%: %
+       $(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
+
+exported: $(addprefix exported-, $(lib_LTLIBRARIES))
+       $(AM_V_GEN)cat $^ > $@
+
+.PHONY: check-api-docs
+check-api-docs: exported man
+       $(AM_V_GEN)for symbol in `cat exported` ; do \
+               if test -f $(builddir)/man/$$symbol.html ; then \
+                       echo "  Symbol $$symbol() is documented." ; \
+               else \
+                       echo "‣ Symbol $$symbol() lacks documentation." ; \
+               fi ; \
+       done
+
+OBJECT_VARIABLES:=$(filter %_OBJECTS,$(.VARIABLES))
+ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v)))
+
+undefined defined: $(ALL_OBJECTS)
+       $(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \
+               $(NM) -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \
+       done | cut -c 20- | cut -d @ -f 1 | sort -u > $@
+
+CLEANFILES += \
+       defined \
+       undefined
+
+.PHONY: check-api-unused
+check-api-unused: defined undefined exported
+       ( cat exported undefined ) | sort -u  | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2-
+
+.PHONY: check-includes
+check-includes: $(top_srcdir)/tools/check-includes.pl
+       $(AM_V_GEN) find * -name '*.[hcS]' -type f -print | sort -u \
+               | xargs $(top_srcdir)/tools/check-includes.pl
+
+EXTRA_DIST += \
+       $(top_srcdir)/tools/check-includes.pl
+
+# Stupid test that everything purported to be exported really is
+define generate-sym-test
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_at)printf '#include <stdio.h>\n' > $@
+       $(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@
+       $(AM_V_at)printf 'void* functions[] = {\n' >> $@
+       $(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@
+       $(AM_V_at)printf '};\nint main(void) {\n' >> $@
+       $(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@
+       $(AM_V_at)printf 'return 0; }\n' >> $@
+endef
+
+test-libelogind-sym.c: \
+               $(top_builddir)/src/libelogind/libelogind.sym \
+               src/systemd/sd-daemon.h \
+               src/systemd/sd-login.h \
+               src/systemd/sd-bus.h \
+               src/systemd/sd-event.h
+       $(generate-sym-test)
+
+test_libelogind_sym_SOURCES = \
+       test-libelogind-sym.c
+test_libelogind_sym_LDADD = \
+       libelogind.la
+
+BUILT_SOURCES += \
+       $(test_libelogind_sym_SOURCES)
+
+tests += \
+       test-libelogind-sym
+
+.PHONY: cppcheck
+cppcheck:
+       cppcheck --enable=all -q $(top_srcdir)
+
+# Used to extract compile flags for YCM.
+print-%:
+       @echo $($*)
+
+git-contrib:
+       @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+
+EXTRA_DIST += \
+        tools/gdb-sd_dump_hashmaps.py
+
+list-keys:
+       gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys
+
+add-key:
+       gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -