X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d18cedcd51e1be63e777a4af3891fd7739f9fdef;hp=e973f1923b309b5649751937d6b09fec24dc8794;hb=7735f2eba43ef4be3f3e9f9111ab2798b1c3e96d;hpb=f48dd74a8d39b6074f820f904953f5cece03b9b0 diff --git a/Makefile.am b/Makefile.am index e973f1923..d18cedcd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,7 +162,6 @@ AM_CPPFLAGS = \ -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 +172,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 \ @@ -582,140 +579,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 +586,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) @@ -896,7 +757,6 @@ BUILT_SOURCES += \ libelogind_internal_la_LIBADD = \ - $(RT_LIBS) \ libelogind-shared.la libelogind_internal_la_LDFLAGS = \ @@ -1136,14 +996,7 @@ 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)|' \ @@ -1180,9 +1033,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)