From 78370bfe8ed645524186dbf658eae8d5a5d54a47 Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay@vrfy.org> Date: Thu, 12 Apr 2012 13:34:18 +0200 Subject: [PATCH] move more main systemd parts to core/ (cherry picked from commit 90ccc3fca7e53a60a9e67b9d5812e1d4a27fc07d) Conflicts: Makefile.am --- Makefile.am | 123 +++++++++++--------- po/POTFILES.skip | 2 +- src/{ => core}/load-fragment-gperf.gperf.m4 | 0 src/{ => core}/org.freedesktop.systemd1.conf | 0 .../org.freedesktop.systemd1.policy.in.in | 0 src/{ => core}/org.freedesktop.systemd1.service | 0 src/{ => core}/system.conf | 0 src/{ => core}/systemd.pc.in | 0 src/{ => core}/user.conf | 0 9 files changed, 66 insertions(+), 59 deletions(-) rename src/{ => core}/load-fragment-gperf.gperf.m4 (100%) rename src/{ => core}/org.freedesktop.systemd1.conf (100%) rename src/{ => core}/org.freedesktop.systemd1.policy.in.in (100%) rename src/{ => core}/org.freedesktop.systemd1.service (100%) rename src/{ => core}/system.conf (100%) rename src/{ => core}/systemd.pc.in (100%) rename src/{ => core}/user.conf (100%) diff --git a/Makefile.am b/Makefile.am index 8114524..c9c643d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,6 +77,10 @@ lib_LTLIBRARIES = pkgconfiglib_DATA = polkitpolicy_in_files = dist_udevrules_DATA = +dist_pkgsysconf_DATA = +dist_dbuspolicy_DATA = +dbusinterface_DATA = +dist_dbussystemservice_DATA = AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ @@ -224,34 +228,9 @@ 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 - nodist_udevrules_DATA = \ src/99-systemd.rules -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 @@ -372,7 +351,6 @@ EXTRA_DIST += \ units/fsck@.service.in \ units/fsck-root.service.in \ units/user@.service.in \ - src/systemd.pc.in \ introspect.awk \ src/99-systemd.rules.in \ man/custom-html.xsl @@ -442,21 +420,6 @@ dist_doc_DATA = \ LICENSE \ 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@ # ------------------------------------------------------------------------------ @@ -770,11 +733,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) \ @@ -797,6 +757,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 @@ -811,6 +783,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 @@ -2278,10 +2289,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 $@ @@ -2296,6 +2303,14 @@ 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) \ @@ -2303,9 +2318,6 @@ CLEANFILES += \ $(pkgconfigdata_DATA) \ $(pkgconfiglib_DATA) \ $(nodist_polkitpolicy_DATA) \ - src/load-fragment-gperf.gperf \ - src/load-fragment-gperf.c \ - src/load-fragment-gperf-nulstr.c \ src/99-systemd.rules if HAVE_VALAC @@ -2351,11 +2363,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) diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 2acacbb..5dc4a51 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -13,7 +13,7 @@ src/core/dbus-timer.c src/core/dbus-unit.c src/hostname/hostnamed.c src/locale/localed.c -src/org.freedesktop.systemd1.policy.in.in +src/core/org.freedesktop.systemd1.policy.in.in src/timedate/timedated.c units/systemd-readahead-done.service.in units/user@.service.in diff --git a/src/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 similarity index 100% rename from src/load-fragment-gperf.gperf.m4 rename to src/core/load-fragment-gperf.gperf.m4 diff --git a/src/org.freedesktop.systemd1.conf b/src/core/org.freedesktop.systemd1.conf similarity index 100% rename from src/org.freedesktop.systemd1.conf rename to src/core/org.freedesktop.systemd1.conf diff --git a/src/org.freedesktop.systemd1.policy.in.in b/src/core/org.freedesktop.systemd1.policy.in.in similarity index 100% rename from src/org.freedesktop.systemd1.policy.in.in rename to src/core/org.freedesktop.systemd1.policy.in.in diff --git a/src/org.freedesktop.systemd1.service b/src/core/org.freedesktop.systemd1.service similarity index 100% rename from src/org.freedesktop.systemd1.service rename to src/core/org.freedesktop.systemd1.service diff --git a/src/system.conf b/src/core/system.conf similarity index 100% rename from src/system.conf rename to src/core/system.conf diff --git a/src/systemd.pc.in b/src/core/systemd.pc.in similarity index 100% rename from src/systemd.pc.in rename to src/core/systemd.pc.in diff --git a/src/user.conf b/src/core/user.conf similarity index 100% rename from src/user.conf rename to src/core/user.conf