chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
libbasic_la_LDFLAGS : Add CAP_LDFLAGS.
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 2a4255ad69371e7353fc9a0623e599c9e3f8e693..fb59c77f70ce57b27b67295dca3e7528d6c75b99 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,8 @@ pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
+systemsleepdir=$(pkglibexecdir)/sleep.d
+systemshutdowndir=$(pkglibexecdir)/shutdown.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
@@ -60,7 +62,6 @@ udevrulesdir=@udevrulesdir@
 udevbindir=@udevbindir@
 udevlibexecdir=$(udevbindir)
 udevhomedir=$(udevlibexecdir)
-udevhwdbdir=$(udevlibexecdir)/hwdb.d
 factory_pamdir = $(datadir)/factory/etc/pam.d
 
 # And these are the special ones for /
@@ -116,11 +117,14 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-       -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
        -DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+       -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
+       -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+       -DHALT=\"$(HALT)\" \
+       -DREBOOT=\"$(REBOOT)\" \
        -DKEXEC=\"$(KEXEC)\" \
        -DLIBDIR=\"$(libdir)\" \
        -DROOTLIBDIR=\"$(rootlibdir)\" \
@@ -129,18 +133,14 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src \
        -I $(top_builddir)/src/basic \
        -I $(top_srcdir)/src/basic \
+       -I $(top_srcdir)/src/core \
        -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/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)
@@ -281,7 +281,7 @@ endif
 endif
 
 EXTRA_DIST += \
-       $(filter-out man/systemd.directives.xml,$(XML_FILES)) \
+       $(filter-out man/elogind.directives.xml,$(XML_FILES)) \
        $(HTML_FILES) \
        $(HTML_ALIAS) \
        $(man_MANS) \
@@ -375,11 +375,13 @@ libbasic_la_CFLAGS = \
        $(CAP_CFLAGS) \
        -pthread
 
+libbasic_la_LDFLAGS = \
+       $(CAP_LDFLAGS)
+
 libbasic_la_LIBADD = \
        $(SELINUX_LIBS) \
        $(CAP_LIBS) \
        -ldl \
-       -lrt \
        -lm
 
 # -----------------------------------------------------------------------------
@@ -411,16 +413,12 @@ endif
 
 libshared_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(ACL_CFLAGS) \
-       $(LIBIDN_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(ACL_CFLAGS)
 
 libshared_la_LIBADD = \
        libelogind-internal.la \
        $(UDEV_LIBS) \
-       $(ACL_LIBS) \
-       $(LIBIDN_LIBS) \
-       $(SECCOMP_LIBS)
+       $(ACL_LIBS)
 
 gperf_txt_sources = \
        src/basic/errno-list.txt
@@ -471,13 +469,13 @@ endif
 
 # ------------------------------------------------------------------------------
 rootlibexec_PROGRAMS += \
-       elogind-cgroups-agent
+       elogind-cgroups-agent
 
 elogind_cgroups_agent_SOURCES = \
-       src/cgroups-agent/cgroups-agent.c
+       src/cgroups-agent/cgroups-agent.c
 
 elogind_cgroups_agent_LDADD = \
-       libshared.la
+       libshared.la
 
 # ------------------------------------------------------------------------------
 libelogind_internal_la_SOURCES = \
@@ -485,11 +483,9 @@ libelogind_internal_la_SOURCES = \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
        src/systemd/sd-event.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/libelogind/libelogind.sym \
        src/libelogind/sd-bus/sd-bus.c \
        src/libelogind/sd-bus/bus-control.c \
@@ -531,11 +527,9 @@ libelogind_internal_la_SOURCES = \
        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 \
-       src/libelogind/sd-path/sd-path.c
+       src/libelogind/sd-login/sd-login.c
 
 libelogind_internal_la_LIBADD = \
        libbasic.la \
@@ -579,13 +573,11 @@ pkgconfiglib_DATA += \
        src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
-       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-messages.h \
        src/systemd/sd-id128.h \
-       src/systemd/sd-daemon.h
+       src/systemd/_sd-common.h
+
 
 lib_LTLIBRARIES += \
        libelogind.la
@@ -624,7 +616,9 @@ libelogind_core_la_SOURCES = \
        src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
        src/login/logind-utmp.c \
-       src/login/logind-acl.h
+       src/login/logind-acl.h \
+       src/core/cgroup.h \
+       src/core/cgroup.c
 
 libelogind_core_la_LIBADD = \
        libshared.la
@@ -739,7 +733,7 @@ dist_dbuspolicy_DATA += \
        src/login/org.freedesktop.login1.conf
 
 dist_pkgsysconf_DATA += \
-       src/login/elogind.conf
+       src/login/logind.conf
 
 polkitpolicy_files += \
        src/login/org.freedesktop.login1.policy
@@ -769,9 +763,7 @@ substitutions = \
        '|bindir=$(bindir)|' \
        '|pkgsysconfdir=$(pkgsysconfdir)|' \
        '|pkgdatadir=$(pkgdatadir)|' \
-       '|udevhwdbdir=$(udevhwdbdir)|' \
        '|udevrulesdir=$(udevrulesdir)|' \
-       '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -782,17 +774,8 @@ substitutions = \
        '|VERSION=$(VERSION)|' \
        '|rootprefix=$(rootprefix)|' \
        '|udevlibexecdir=$(udevlibexecdir)|' \
-       '|SUSHELL=$(SUSHELL)|' \
-       '|SULOGIN=$(SULOGIN)|' \
-       '|DEBUGTTY=$(DEBUGTTY)|' \
        '|KILL=$(KILL)|' \
-       '|KMOD=$(KMOD)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
-       '|QUOTAON=$(QUOTAON)|' \
-       '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
-       '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
-       '|NTP_SERVERS=$(NTP_SERVERS)|' \
-       '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
        '|TTY_GID=$(TTY_GID)|'
@@ -811,9 +794,6 @@ sysctl.d/%: sysctl.d/%.in
 %.pc: %.pc.in
        $(SED_PROCESS)
 
-%.conf: %.conf.in
-       $(SED_PROCESS)
-
 shell-completion/%: shell-completion/%.in
        $(SED_PROCESS)
 
@@ -935,8 +915,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
-       --with-rootprefix=$$dc_install_base \
-       --enable-compat-libs
+       --with-rootprefix=$$dc_install_base
 
 if ENABLE_SPLIT_USR
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -946,8 +925,7 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --disable-split-usr
 endif
 
-.PHONY: dist-check-compat-libs dist-check-help
-dist-check-compat-libs:
+.PHONY: dist-check-help
 
 dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
@@ -957,7 +935,7 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
                exit 1;                                                        \
             fi; done
 
-dist: dist-check-compat-libs
+dist:
 
 .PHONY: git-tag
 git-tag:
@@ -1038,7 +1016,6 @@ test-libelogind-sym.c: \
                src/systemd/sd-daemon.h \
                src/systemd/sd-login.h \
                src/systemd/sd-bus.h \
-               src/systemd/sd-path.h \
                src/systemd/sd-event.h
        $(generate-sym-test)
 
Unnamed repository; edit this file 'description' to name the repository.