X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=8205994ed8736ec6a003a1ec81e80745801e28ed;hp=2a4255ad69371e7353fc9a0623e599c9e3f8e693;hb=2ce8152bd305e6cb29732222649db8b662e10113;hpb=aead9bd04191188f78f2565e0d9d25c586bdbf99

diff --git a/Makefile.am b/Makefile.am
index 2a4255ad6..8205994ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,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,8 +115,6 @@ 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\" \
@@ -412,14 +409,12 @@ endif
 libshared_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(ACL_CFLAGS) \
-	$(LIBIDN_CFLAGS) \
 	$(SECCOMP_CFLAGS)
 
 libshared_la_LIBADD = \
 	libelogind-internal.la \
 	$(UDEV_LIBS) \
 	$(ACL_LIBS) \
-	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
 
 gperf_txt_sources = \
@@ -469,16 +464,6 @@ dist_factory_pam_DATA = \
 	factory/etc/pam.d/other
 endif
 
-# ------------------------------------------------------------------------------
-rootlibexec_PROGRAMS += \
-	elogind-cgroups-agent
-
-elogind_cgroups_agent_SOURCES = \
-	src/cgroups-agent/cgroups-agent.c
-
-elogind_cgroups_agent_LDADD = \
-	libshared.la
-
 # ------------------------------------------------------------------------------
 libelogind_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
@@ -489,7 +474,6 @@ libelogind_internal_la_SOURCES = \
 	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 \
@@ -534,8 +518,7 @@ libelogind_internal_la_SOURCES = \
 	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 \
@@ -769,9 +752,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 +763,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)|'
@@ -935,8 +907,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 +917,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 +927,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 +1008,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)