X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=813ced272e511d38c79f9f1b211bbd8c5e35342c;hp=54cc5096f42afee383aab0f4f209325603b3bc1a;hb=bd5b0d57ef3fceef3ed61d0e06a8e1f3d8417048;hpb=146de8175e11c877908f20f8ed1b5a3805455c0a diff --git a/Makefile.am b/Makefile.am index 54cc5096f..813ced272 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,6 +94,10 @@ polkitpolicy_in_files = dist_udevrules_DATA = nodist_udevrules_DATA = dist_man_MANS = +dist_pkgsysconf_DATA = +dist_dbuspolicy_DATA = +dbusinterface_DATA = +dist_dbussystemservice_DATA = AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ @@ -126,6 +130,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src \ -I $(top_srcdir)/src/shared \ -I $(top_srcdir)/src/login \ + -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/systemd \ -I $(top_srcdir)/src/core \ -I $(top_srcdir)/src/udev @@ -201,7 +206,8 @@ bin_PROGRAMS = \ systemd-cgls \ systemd-cgtop \ systemd-stdio-bridge \ - systemd-nspawn + systemd-nspawn \ + systemd-detect-virt dist_bin_SCRIPTS = \ src/systemd-analyze @@ -219,7 +225,6 @@ rootlibexec_PROGRAMS = \ systemd-fsck \ systemd-timestamp \ systemd-ac-power \ - systemd-detect-virt \ systemd-sysctl systemgenerator_PROGRAMS = \ @@ -238,31 +243,6 @@ noinst_PROGRAMS = \ test-install \ test-watchdog -dist_pkgsysconf_DATA = \ - src/system.conf \ - src/user.conf - -dist_dbuspolicy_DATA = \ - src/org.freedesktop.systemd1.conf - -dist_dbussystemservice_DATA = \ - src/org.freedesktop.systemd1.service - -dbusinterface_DATA = \ - org.freedesktop.systemd1.Manager.xml \ - org.freedesktop.systemd1.Job.xml \ - org.freedesktop.systemd1.Unit.xml \ - org.freedesktop.systemd1.Service.xml \ - org.freedesktop.systemd1.Socket.xml \ - org.freedesktop.systemd1.Timer.xml \ - org.freedesktop.systemd1.Target.xml \ - org.freedesktop.systemd1.Device.xml \ - org.freedesktop.systemd1.Mount.xml \ - org.freedesktop.systemd1.Automount.xml \ - org.freedesktop.systemd1.Snapshot.xml \ - org.freedesktop.systemd1.Swap.xml \ - org.freedesktop.systemd1.Path.xml - dist_bashcompletion_DATA = \ src/systemd-bash-completion.sh @@ -391,7 +371,6 @@ EXTRA_DIST += \ units/udev.service \ units/udev-trigger.service \ units/udev-settle.service \ - src/systemd.pc.in \ introspect.awk \ man/custom-html.xsl @@ -462,21 +441,6 @@ dist_doc_DATA = \ LICENSE.MIT \ DISTRO_PORTING -pkgconfigdata_DATA = \ - src/systemd.pc - -# First passed through sed, followed by intltool -polkitpolicy_in_in_files = \ - src/org.freedesktop.systemd1.policy.in.in - -nodist_polkitpolicy_DATA = \ - $(polkitpolicy_in_files:.policy.in=.policy) \ - $(polkitpolicy_in_in_files:.policy.in.in=.policy) - -EXTRA_DIST += \ - $(polkitpolicy_in_files) \ - $(polkitpolicy_in_in_files) - @INTLTOOL_POLICY_RULE@ # ------------------------------------------------------------------------------ @@ -521,6 +485,7 @@ MANPAGES = \ man/systemd-ask-password.1 \ man/systemd-cat.1 \ man/systemd-machine-id-setup.1 \ + man/systemd-detect-virt.1 \ man/journald.conf.5 \ man/journalctl.1 @@ -556,9 +521,12 @@ noinst_LTLIBRARIES += \ libsystemd-shared.la libsystemd_shared_la_SOURCES = \ - src/missing.h \ src/linux/auto_dev-ioctl.h \ src/linux/fanotify.h \ + src/shared/list.h \ + src/shared/macro.h \ + src/shared/def.h \ + src/shared/missing.h \ src/shared/util.c \ src/shared/util.h \ src/shared/virt.c \ @@ -586,10 +554,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/socket-util.h \ src/shared/cgroup-util.c \ src/shared/cgroup-util.h \ - src/shared/dbus-common.c \ - src/shared/dbus-common.h \ - src/shared/hostname-setup.c \ - src/shared/hostname-setup.h \ src/shared/logs-show.c \ src/shared/logs-show.h \ src/shared/cgroup-show.c \ @@ -604,22 +568,38 @@ libsystemd_shared_la_SOURCES = \ src/shared/spawn-ask-password-agent.h \ src/shared/mount-setup.c \ src/shared/mount-setup.h \ - src/shared/machine-id-util.c \ - src/shared/machine-id-util.h \ + src/shared/machine-id-setup.c \ + src/shared/machine-id-setup.h \ src/shared/loopback-setup.h \ src/shared/loopback-setup.c \ src/shared/specifier.c \ src/shared/specifier.h \ src/shared/spawn-polkit-agent.c \ - src/shared/spawn-polkit-agent.h \ - src/shared/list.h \ - src/shared/macro.h \ - src/shared/ask-password-api.h + src/shared/spawn-polkit-agent.h libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) +#------------------------------------------------------------------------------- +noinst_LTLIBRARIES += \ + libsystemd-dbus.la + +libsystemd_dbus_la_SOURCES = \ + src/shared/dbus-common.c \ + src/shared/dbus-common.h \ + src/shared/dbus-loop.c \ + src/shared/dbus-loop.h \ + src/shared/polkit.c \ + src/shared/polkit.h + +libsystemd_dbus_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +libsystemd_dbus_la_LIBADD = \ + $(DBUS_LIBS) + # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-label.la @@ -634,7 +614,9 @@ libsystemd_label_la_SOURCES = \ src/shared/label.c \ src/shared/label.h \ src/shared/mkdir.c \ - src/shared/mkdir.h + src/shared/mkdir.h \ + src/shared/ask-password-api.c \ + src/shared/ask-password-api.h libsystemd_label_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -692,7 +674,6 @@ noinst_LTLIBRARIES += \ libsystemd-core.la libsystemd_core_la_SOURCES = \ - src/def.h \ src/core/unit.c \ src/core/unit.h \ src/core/job.c \ @@ -765,6 +746,8 @@ libsystemd_core_la_SOURCES = \ src/core/kmod-setup.h \ src/core/locale-setup.h \ src/core/locale-setup.c \ + src/core/hostname-setup.c \ + src/core/hostname-setup.h \ src/core/fdset.c \ src/core/fdset.h \ src/core/condition.c \ @@ -783,11 +766,8 @@ libsystemd_core_la_SOURCES = \ src/core/sysfs-show.h nodist_libsystemd_core_la_SOURCES = \ - src/load-fragment-gperf.c \ - src/load-fragment-gperf-nulstr.c - -EXTRA_DIST += \ - src/load-fragment-gperf.gperf.m4 + src/core/load-fragment-gperf.c \ + src/core/load-fragment-gperf-nulstr.c libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -801,6 +781,7 @@ libsystemd_core_la_LIBADD = \ libsystemd-capability.la \ libsystemd-label.la \ libsystemd-shared.la \ + libsystemd-dbus.la \ libudev.la \ $(DBUS_LIBS) \ $(LIBWRAP_LIBS) \ @@ -809,6 +790,18 @@ libsystemd_core_la_LIBADD = \ $(CAP_LIBS) \ $(KMOD_LIBS) +src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(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 ";" }' < $< > $@ || rm $@ + +EXTRA_DIST += \ + src/core/load-fragment-gperf.gperf.m4 + +CLEANFILES += \ + src/core/load-fragment-gperf.gperf \ + src/core/load-fragment-gperf.c \ + src/core/load-fragment-gperf-nulstr.c + # ------------------------------------------------------------------------------ systemd_SOURCES = \ src/core/main.c @@ -820,7 +813,47 @@ systemd_CFLAGS = \ systemd_LDADD = \ libsystemd-core.la \ libsystemd-daemon.la \ - libsystemd-id128.la + libsystemd-id128.la \ + libsystemd-dbus.la + +dist_pkgsysconf_DATA += \ + src/core/system.conf \ + src/core/user.conf + +dist_dbuspolicy_DATA += \ + src/core/org.freedesktop.systemd1.conf + +dist_dbussystemservice_DATA += \ + src/core/org.freedesktop.systemd1.service + +dbusinterface_DATA += \ + org.freedesktop.systemd1.Manager.xml \ + org.freedesktop.systemd1.Job.xml \ + org.freedesktop.systemd1.Unit.xml \ + org.freedesktop.systemd1.Service.xml \ + org.freedesktop.systemd1.Socket.xml \ + org.freedesktop.systemd1.Timer.xml \ + org.freedesktop.systemd1.Target.xml \ + org.freedesktop.systemd1.Device.xml \ + org.freedesktop.systemd1.Mount.xml \ + org.freedesktop.systemd1.Automount.xml \ + org.freedesktop.systemd1.Snapshot.xml \ + org.freedesktop.systemd1.Swap.xml \ + org.freedesktop.systemd1.Path.xml + +polkitpolicy_in_in_files = \ + src/core/org.freedesktop.systemd1.policy.in.in + +org.freedesktop.systemd1.%.xml: systemd + $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \ + $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ + $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp + +pkgconfigdata_DATA = \ + src/core/systemd.pc + +EXTRA_DIST += \ + src/core/systemd.pc.in # ------------------------------------------------------------------------------ test_engine_SOURCES = \ @@ -832,7 +865,8 @@ test_engine_CFLAGS = \ test_engine_LDADD = \ libsystemd-core.la \ - libsystemd-daemon.la + libsystemd-daemon.la \ + libsystemd-dbus.la test_job_type_SOURCES = \ src/test/test-job-type.c @@ -860,7 +894,7 @@ test_hostname_SOURCES = \ src/test/test-hostname.c test_hostname_LDADD = \ - libsystemd-shared.la + libsystemd-core.la test_daemon_SOURCES = \ src/test/test-daemon.c @@ -916,6 +950,7 @@ systemd_initctl_CFLAGS = \ systemd_initctl_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) # ------------------------------------------------------------------------------ @@ -929,6 +964,7 @@ systemd_update_utmp_CFLAGS = \ systemd_update_utmp_LDADD = \ libsystemd-shared.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) \ $(AUDIT_LIBS) @@ -977,7 +1013,7 @@ systemd_tmpfiles_LDADD = \ # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ - src/machine-id-setup.c + src/machine-id-setup/machine-id-setup-main.c systemd_machine_id_setup_LDADD = \ libsystemd-label.la \ @@ -1001,6 +1037,7 @@ systemd_fsck_CFLAGS = \ systemd_fsck_LDADD = \ libsystemd-shared.la \ + libsystemd-dbus.la \ libudev.la \ $(DBUS_LIBS) @@ -1059,6 +1096,7 @@ systemd_cgroups_agent_CFLAGS = \ systemd_cgroups_agent_LDADD = \ libsystemd-shared.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) # ------------------------------------------------------------------------------ @@ -1075,6 +1113,7 @@ systemctl_LDADD = \ libsystemd-daemon.la \ libsystemd-journal.la \ libsystemd-id128.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) # ------------------------------------------------------------------------------ @@ -1088,8 +1127,7 @@ systemd_notify_LDADD = \ # ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ - src/ask-password.c \ - src/ask-password-api.c + src/ask-password.c systemd_ask_password_LDADD = \ libsystemd-label.la \ @@ -1128,15 +1166,14 @@ systemd_nspawn_LDADD = \ # ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ - src/bridge.c + src/stdio-bridge/stdio-bridge.c systemd_stdio_bridge_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ - src/tty-ask-password-agent.c \ - src/ask-password-api.c + src/tty-ask-password-agent.c systemd_tty_ask_password_agent_LDADD = \ libsystemd-label.la \ @@ -1144,7 +1181,7 @@ systemd_tty_ask_password_agent_LDADD = \ # ------------------------------------------------------------------------------ libsystemd_daemon_la_SOURCES = \ - src/sd-daemon.c + src/libsystemd-daemon/sd-daemon.c libsystemd_daemon_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1155,7 +1192,7 @@ libsystemd_daemon_la_LDFLAGS = \ $(AM_LDFLAGS) \ -shared \ -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \ - -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym + -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym pkginclude_HEADERS += \ src/systemd/sd-daemon.h @@ -1183,7 +1220,7 @@ lib_LTLIBRARIES += \ libsystemd-daemon.la pkgconfiglib_DATA += \ - src/libsystemd-daemon.pc + src/libsystemd-daemon/libsystemd-daemon.pc MANPAGES += \ man/sd-daemon.7 \ @@ -1206,8 +1243,8 @@ man/sd_is_mq.3: man/sd_is_fifo.3 man/sd_notifyf.3: man/sd_notify.3 EXTRA_DIST += \ - src/libsystemd-daemon.pc.in \ - src/libsystemd-daemon.sym + src/libsystemd-daemon/libsystemd-daemon.pc.in \ + src/libsystemd-daemon/libsystemd-daemon.sym # ------------------------------------------------------------------------------ SUBDIRS += \ @@ -1845,7 +1882,7 @@ udevlibexec_PROGRAMS += \ # ------------------------------------------------------------------------------ libsystemd_id128_la_SOURCES = \ - src/sd-id128.c + src/libsystemd-id128/sd-id128.c libsystemd_id128_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1855,7 +1892,7 @@ libsystemd_id128_la_LDFLAGS = \ $(AM_LDFLAGS) \ -shared \ -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \ - -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym + -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ libsystemd-shared.la @@ -1877,7 +1914,7 @@ lib_LTLIBRARIES += \ libsystemd-id128.la pkgconfiglib_DATA += \ - src/libsystemd-id128.pc + src/libsystemd-id128/libsystemd-id128.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-id128-install-hook: @@ -1899,8 +1936,8 @@ UNINSTALL_EXEC_HOOKS += \ libsystemd-id128-uninstall-hook EXTRA_DIST += \ - src/libsystemd-id128.pc.in \ - src/libsystemd-id128.sym + src/libsystemd-id128/libsystemd-id128.pc.in \ + src/libsystemd-id128/libsystemd-id128.sym # ------------------------------------------------------------------------------ systemd_journald_SOURCES = \ @@ -2315,8 +2352,7 @@ dist_systemunit_DATA += \ units/cryptsetup.target systemd_cryptsetup_SOURCES = \ - src/cryptsetup/cryptsetup.c \ - src/ask-password-api.c + src/cryptsetup/cryptsetup.c systemd_cryptsetup_CFLAGS = \ $(AM_CFLAGS) \ @@ -2349,9 +2385,7 @@ endif # ------------------------------------------------------------------------------ if ENABLE_HOSTNAMED systemd_hostnamed_SOURCES = \ - src/hostname/hostnamed.c \ - src/polkit.c \ - src/polkit.h + src/hostname/hostnamed.c systemd_hostnamed_CFLAGS = \ $(AM_CFLAGS) \ @@ -2360,6 +2394,7 @@ systemd_hostnamed_CFLAGS = \ systemd_hostnamed_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) rootlibexec_PROGRAMS += \ @@ -2400,9 +2435,7 @@ endif # ------------------------------------------------------------------------------ if ENABLE_LOCALED systemd_localed_SOURCES = \ - src/locale/localed.c \ - src/polkit.c \ - src/polkit.h + src/locale/localed.c systemd_localed_CFLAGS = \ $(AM_CFLAGS) \ @@ -2412,6 +2445,7 @@ systemd_localed_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) nodist_systemunit_DATA += \ @@ -2462,9 +2496,7 @@ endif # ------------------------------------------------------------------------------ if ENABLE_TIMEDATED systemd_timedated_SOURCES = \ - src/timedate/timedated.c \ - src/polkit.c \ - src/polkit.h + src/timedate/timedated.c systemd_timedated_CFLAGS = \ $(AM_CFLAGS) \ @@ -2473,6 +2505,7 @@ systemd_timedated_CFLAGS = \ systemd_timedated_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) rootlibexec_PROGRAMS += \ @@ -2527,10 +2560,6 @@ systemd_logind_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ - src/dbus-loop.c \ - src/dbus-loop.h \ - src/polkit.c \ - src/polkit.h \ src/login/logind-acl.h nodist_systemd_logind_SOURCES = \ @@ -2545,6 +2574,7 @@ systemd_logind_LDADD = \ libsystemd-shared.la \ libsystemd-audit.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ libudev.la \ $(DBUS_LIBS) @@ -2576,6 +2606,7 @@ loginctl_CFLAGS = \ loginctl_LDADD = \ libsystemd-shared.la \ + libsystemd-dbus.la \ libudev.la \ $(DBUS_LIBS) @@ -2832,10 +2863,6 @@ src/%: src/%.m4 $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@ -src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(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 ";" }' < $< > $@ || rm $@ - M4_PROCESS_SYSTEM = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@ @@ -2850,16 +2877,21 @@ units/%: units/%.m4 Makefile units/user/%: units/%.m4 Makefile $(M4_PROCESS_USER) +nodist_polkitpolicy_DATA = \ + $(polkitpolicy_in_files:.policy.in=.policy) \ + $(polkitpolicy_in_in_files:.policy.in.in=.policy) + +EXTRA_DIST += \ + $(polkitpolicy_in_files) \ + $(polkitpolicy_in_in_files) + CLEANFILES += \ $(nodist_systemunit_DATA) \ $(nodist_userunit_DATA) \ $(nodist_man_MANS) \ $(pkgconfigdata_DATA) \ $(pkgconfiglib_DATA) \ - $(nodist_polkitpolicy_DATA) \ - src/load-fragment-gperf.gperf \ - src/load-fragment-gperf.c \ - src/load-fragment-gperf-nulstr.c + $(nodist_polkitpolicy_DATA) if HAVE_XSLTPROC XSLTPROC_FLAGS = \ @@ -2899,11 +2931,6 @@ endif DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h -org.freedesktop.systemd1.%.xml: systemd - $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \ - $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ - $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp - CLEANFILES += \ $(dbusinterface_DATA)