summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-12-31 07:40:31 +0100
committerKay Sievers <kay.sievers@vrfy.org>2011-12-31 07:40:31 +0100
commit609518c1d2abb511bd1fce447a1aa369e92a0bdb (patch)
tree0b752029993add1ed6d8e64e909c1640db7aa52f
parent681cfc6c40b176f73204c9088bfc5a7e8bad4317 (diff)
binfmt: move sources to subdirectory
-rw-r--r--Makefile.am85
-rw-r--r--src/binfmt/binfmt.c (renamed from src/binfmt.c)0
2 files changed, 38 insertions, 47 deletions
diff --git a/Makefile.am b/Makefile.am
index 299b9e5e68..5f7b505a3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -197,11 +197,6 @@ rootlibexec_PROGRAMS = \
systemd-sysctl \
systemd-journald
-if ENABLE_BINFMT
-rootlibexec_PROGRAMS += \
- systemd-binfmt
-endif
-
systemgenerator_PROGRAMS = \
systemd-getty-generator
@@ -347,12 +342,6 @@ dist_systemunit_DATA += \
units/var-lock.mount
endif
-if ENABLE_BINFMT
-dist_systemunit_DATA += \
- units/proc-sys-fs-binfmt_misc.automount \
- units/proc-sys-fs-binfmt_misc.mount
-endif
-
nodist_systemunit_DATA = \
units/getty@.service \
units/serial-getty@.service \
@@ -388,11 +377,6 @@ nodist_systemunit_DATA = \
units/rescue.service \
units/user@.service
-if ENABLE_BINFMT
-nodist_systemunit_DATA += \
- units/systemd-binfmt.service
-endif
-
dist_userunit_DATA = \
units/user/default.target \
units/user/exit.target
@@ -447,11 +431,6 @@ EXTRA_DIST += \
src/99-systemd.rules.in \
man/custom-html.xsl
-if ENABLE_BINFMT
-EXTRA_DIST += \
- units/systemd-binfmt.service.in
-endif
-
if TARGET_FEDORA
dist_systemunit_DATA += \
units/fedora/prefdm.service \
@@ -737,11 +716,6 @@ MANPAGES = \
man/sd_seat_get_active.3 \
man/sd_get_seats.3
-if ENABLE_BINFMT
-MANPAGES += \
- man/binfmt.d.5
-endif
-
MANPAGES_ALIAS = \
man/reboot.8 \
man/poweroff.8 \
@@ -1046,6 +1020,44 @@ dist_noinst_SCRIPT = \
src/generate-kbd-model-map
# ------------------------------------------------------------------------------
+if ENABLE_BINFMT
+systemd_binfmt_SOURCES = \
+ src/binfmt/binfmt.c
+
+systemd_binfmt_LDADD = \
+ libsystemd-basic.la
+
+rootlibexec_PROGRAMS += \
+ systemd-binfmt
+
+dist_systemunit_DATA += \
+ units/proc-sys-fs-binfmt_misc.automount \
+ units/proc-sys-fs-binfmt_misc.mount
+
+nodist_systemunit_DATA += \
+ units/systemd-binfmt.service
+
+binfmt-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(prefix)/lib/binfmt.d \
+ $(DESTDIR)$(sysconfdir)/binfmt.d
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+ rm -f systemd-binfmt.service \
+ proc-sys-fs-binfmt_misc.automount && \
+ $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
+ $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
+
+INSTALL_DATA_HOOKS += \
+ binfmt-install-data-hook
+
+MANPAGES += \
+ man/binfmt.d.5
+
+EXTRA_DIST += \
+ units/systemd-binfmt.service.in
+endif
+
+# ------------------------------------------------------------------------------
if ENABLE_HOSTNAMED
systemd_hostnamed_SOURCES = \
src/hostname/hostnamed.c \
@@ -1455,15 +1467,6 @@ systemd_sysctl_CFLAGS = \
systemd_sysctl_LDADD = \
libsystemd-basic.la
-systemd_binfmt_SOURCES = \
- src/binfmt.c
-
-systemd_binfmt_CFLAGS = \
- $(AM_CFLAGS)
-
-systemd_binfmt_LDADD = \
- libsystemd-basic.la
-
systemd_fsck_SOURCES = \
src/fsck.c \
src/dbus-common.c
@@ -2048,11 +2051,6 @@ systemd-install-data-hook:
$(DESTDIR)$(systemshutdowndir) \
$(DESTDIR)$(systemgeneratordir) \
$(DESTDIR)$(usergeneratordir)
-if ENABLE_BINFMT
- $(MKDIR_P) -m 0755 \
- $(DESTDIR)$(prefix)/lib/binfmt.d \
- $(DESTDIR)$(sysconfdir)/binfmt.d
-endif
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(userunitdir) \
@@ -2178,13 +2176,6 @@ endif
$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
$(LN_S) ../systemd-kmsg-syslogd.service && \
$(LN_S) ../cryptsetup.target cryptsetup.target )
-if ENABLE_BINFMT
- ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
- rm -f systemd-binfmt.service \
- proc-sys-fs-binfmt_misc.automount && \
- $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
- $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
-endif
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f systemd-tmpfiles-clean.timer && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
diff --git a/src/binfmt.c b/src/binfmt/binfmt.c
index e8d6524391..e8d6524391 100644
--- a/src/binfmt.c
+++ b/src/binfmt/binfmt.c