X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d56edec2ea79f092c58a2d8027e8aae48065dfab;hp=e973f1923b309b5649751937d6b09fec24dc8794;hb=b952404b9386ed0ef806a830d184f696b2432e77;hpb=f48dd74a8d39b6074f820f904953f5cece03b9b0 diff --git a/Makefile.am b/Makefile.am index e973f1923..d56edec2e 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,24 +124,10 @@ 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\" \ - -DQUOTACHECK=\"$(QUOTACHECK)\" \ -DKEXEC=\"$(KEXEC)\" \ -DLIBDIR=\"$(libdir)\" \ -DROOTLIBDIR=\"$(rootlibdir)\" \ @@ -173,8 +138,6 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/shared \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/systemd \ - -I $(top_builddir)/src/core \ - -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-device \ @@ -308,7 +271,6 @@ AM_V_RM_0 = @echo " RM " $@; rootbin_PROGRAMS = bin_PROGRAMS = rootlibexec_PROGRAMS = -systemgenerator_PROGRAMS = dist_bashcompletion_DATA = dist_zshcompletion_DATA = @@ -404,8 +366,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 \ @@ -479,8 +439,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 \ @@ -582,140 +540,6 @@ libelogind_acl_la_LIBADD = \ $(ACL_LIBS) endif -# ------------------------------------------------------------------------------ -#noinst_LTLIBRARIES += \ -# elogind-core.la - -elogind_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_elogind_core_la_SOURCES = \ - src/core/load-fragment-gperf.c \ - src/core/load-fragment-gperf-nulstr.c - -elogind_core_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(PAM_CFLAGS) \ - -pthread - -elogind_core_la_LIBADD = \ - libelogind-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 ";" }' < $< > $@ - -gperf_gperf_m4_sources = \ - src/core/load-fragment-gperf.gperf.m4 - gperf_txt_sources = \ src/shared/errno-list.txt \ src/shared/af-list.txt \ @@ -723,8 +547,6 @@ gperf_txt_sources = \ src/shared/cap-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) @@ -790,8 +612,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 = \ @@ -896,7 +717,6 @@ BUILT_SOURCES += \ libelogind_internal_la_LIBADD = \ - $(RT_LIBS) \ libelogind-shared.la libelogind_internal_la_LDFLAGS = \ @@ -1109,56 +929,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)|' \ - '|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)|' + '|systemgidmax=$(SYSTEM_GID_MAX)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -1180,9 +965,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)