X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7e7f29a210440944b83d952597c7a0dbf7a03572;hp=7eb773092266360236057b3943ae64fdcfae482e;hb=f6924f1697ef6aa17e3a7f2e5c74a97c062fe13b;hpb=0ea3f901134d2b78c177d3353523db5c39df629b

diff --git a/Makefile.am b/Makefile.am
index 7eb773092..7e7f29a21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,32 +54,13 @@ bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
 varlogdir=$(localstatedir)/log
 elogindstatedir=$(localstatedir)/lib/elogind
-catalogstatedir=$(elogindstatedir)/catalog
-xinitrcdir=$(sysconfdir)/X11/xinit/xinitrc.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
-userunitdir=$(prefix)/lib/elogind/user
-userpresetdir=$(prefix)/lib/elogind/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/elogind/network
 pkgincludedir=$(includedir)/elogind
-systemgeneratordir=$(rootlibexecdir)/system-generators
-usergeneratordir=$(prefix)/lib/elogind/user-generators
-systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemsleepdir=$(rootlibexecdir)/system-sleep
-systemunitdir=$(rootprefix)/lib/elogind/system
-systempresetdir=$(rootprefix)/lib/elogind/system-preset
 udevrulesdir=$(rootprefix)/lib/udev/rules.d
-catalogdir=$(prefix)/lib/elogind/catalog
-kernelinstalldir = $(prefix)/lib/kernel/install.d
 factory_etcdir = $(prefix)/share/factory/etc
 factory_pamdir = $(prefix)/share/factory/etc/pam.d
-bootlibdir = $(prefix)/lib/elogind/boot/efi
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -108,8 +89,6 @@ nodist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
-dist_systemunit_DATA_busnames =
-dist_sysusers_DATA =
 check_PROGRAMS =
 check_DATA =
 tests=
@@ -145,22 +124,9 @@ AM_CPPFLAGS = \
 	-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/elogind/\" \
-	-DRANDOM_SEED=\"$(localstatedir)/lib/elogind/random-seed\" \
-	-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-	-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-	-DELOGIND_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-	-DELOGIND_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
-	-DX_SERVER=\"$(bindir)/X\" \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
@@ -241,10 +207,6 @@ 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)
 
@@ -305,7 +267,6 @@ AM_V_RM_0 = @echo "  RM      " $@;
 rootbin_PROGRAMS =
 bin_PROGRAMS =
 rootlibexec_PROGRAMS =
-systemgenerator_PROGRAMS =
 dist_bashcompletion_DATA =
 dist_zshcompletion_DATA =
 
@@ -401,8 +362,6 @@ libelogind_shared_la_SOURCES = \
 	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 \
@@ -476,8 +435,6 @@ libelogind_shared_la_SOURCES = \
 	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 \
@@ -651,8 +608,7 @@ 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
+dist_factory_etc_DATA =
 
 if HAVE_PAM
 dist_factory_pam_DATA = \
@@ -757,7 +713,6 @@ BUILT_SOURCES += \
 
 
 libelogind_internal_la_LIBADD = \
-	$(RT_LIBS) \
 	libelogind-shared.la
 
 libelogind_internal_la_LDFLAGS = \
@@ -775,7 +730,7 @@ INSTALL_EXEC_HOOKS += libelogind-install-hook
 UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
 
 pkgconfiglib_DATA += \
-	src/libelogind/libsystemd.pc
+	src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
 	src/systemd/sd-login.h
@@ -970,53 +925,21 @@ substitutions = \
        '|rootbindir=$(rootbindir)|' \
        '|bindir=$(bindir)|' \
        '|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/elogind/|' \
-       '|RANDOM_SEED=$(localstatedir)/lib/elogind/random-seed|' \
        '|prefix=$(prefix)|' \
        '|exec_prefix=$(exec_prefix)|' \
        '|libdir=$(libdir)|' \
        '|includedir=$(includedir)|' \
        '|VERSION=$(VERSION)|' \
        '|rootprefix=$(rootprefix)|' \
-       '|udevlibexecdir=$(udevlibexecdir)|' \
-       '|SUSHELL=$(SUSHELL)|' \
-       '|SULOGIN=$(SULOGIN)|' \
-       '|DEBUGTTY=$(DEBUGTTY)|' \
-       '|KMOD=$(KMOD)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
-       '|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)|'
+       '|systemgidmax=$(SYSTEM_GID_MAX)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1167,26 +1090,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-split-usr \
 	--enable-kdbus
 
-DISTCHECK_CONFIGURE_FLAGS += \
-	--with-sysvinit-path= \
-	--with-sysvrcnd-path=
-
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \
 	--enable-gtk-doc
 endif
-
-#
-# Require python when making dist
-#
-.PHONY: dist-check-help
-
-dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
-	for i in $(abspath $^); do                                             \
-            if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
-		echo "$(basename $$i) --help output is too wide:";             \
-	        $$i  --help | awk 'length > 80' | grep -E --color=yes '.{80}'; \
-	        exit 1;                                                        \
-            fi; done
-
-dist: dist-check-python