X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=8b1cafe702855faa5e4c35dbc8f94975afe03f97;hp=829db7e9ef03228ea5ae33805393853cb0f4181d;hb=b6e661357ce25601829943c7f98981a92b3f1b68;hpb=379079ba6b06e82de9a8f0025456308a34b4b115 diff --git a/Makefile.am b/Makefile.am index 829db7e9e..8b1cafe70 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 \ @@ -238,31 +242,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 +370,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 +440,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@ # ------------------------------------------------------------------------------ @@ -588,8 +551,6 @@ libsystemd_shared_la_SOURCES = \ 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,8 +565,8 @@ 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 \ @@ -765,6 +726,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 +746,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) \ @@ -809,6 +769,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 @@ -822,6 +794,45 @@ systemd_LDADD = \ libsystemd-daemon.la \ libsystemd-id128.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 = \ src/test/test-engine.c @@ -860,7 +871,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 @@ -946,9 +957,9 @@ pkginclude_HEADERS += \ # ------------------------------------------------------------------------------ systemd_shutdown_SOURCES = \ - src/umount.c \ - src/umount.h \ - src/shutdown.c + src/core/umount.c \ + src/core/umount.h \ + src/core/shutdown.c systemd_shutdown_LDADD = \ libsystemd-label.la \ @@ -977,7 +988,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 \ @@ -2832,10 +2843,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 +2857,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 +2911,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)