build-sys: get rid of special fedor install target

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a45f333ac6de25fc0390eb80d63a680d6bbc9cb4..d7a279c152297ce7586961d5a5026ec3d602e8a2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,7 +119,8 @@ rootlibexec_PROGRAMS = \
        systemd-fsck \
        systemd-quotacheck \
        systemd-timestamp \
-       systemd-ac-power
+       systemd-ac-power \
+       systemd-sysctl
 
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -223,7 +224,6 @@ dist_systemunit_DATA = \
        units/var-run.mount \
        units/hwclock-load.service \
        units/hwclock-save.service \
-       units/sysctl.service \
        units/remount-rootfs.service \
        units/printer.target \
        units/bluetooth.target \
@@ -261,6 +261,7 @@ nodist_systemunit_DATA = \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-plymouth.service \
        units/systemd-ask-password-console.service \
+       units/systemd-sysctl.service \
        units/syslog.target \
        units/halt.service \
        units/poweroff.service \
@@ -306,6 +307,7 @@ EXTRA_DIST = \
        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-plymouth.service.in \
        units/systemd-ask-password-console.service.in \
+       units/systemd-sysctl.service.in \
        units/syslog.target.in \
        units/halt.service.in \
        units/poweroff.service.in \
@@ -315,7 +317,8 @@ EXTRA_DIST = \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
-       systemd.pc.in
+       systemd.pc.in \
+       introspect.awk
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -503,7 +506,12 @@ MANPAGES = \
        man/shutdown.8 \
        man/pam_systemd.8 \
        man/systemd.conf.5 \
-       man/tmpfiles.d.5
+       man/tmpfiles.d.5 \
+       man/hostname.5 \
+       man/vconsole.conf.5 \
+       man/locale.conf.5 \
+       man/os-release.5 \
+       man/modules-load.d.5
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -713,6 +721,15 @@ systemd_tmpfiles_CFLAGS = \
 systemd_tmpfiles_LDADD = \
        libsystemd-basic.la
 
+systemd_sysctl_SOURCES = \
+       src/sysctl.c
+
+systemd_sysctl_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_sysctl_LDADD = \
+       libsystemd-basic.la
+
 systemd_fsck_SOURCES = \
        src/fsck.c \
        src/dbus-common.c
@@ -762,10 +779,12 @@ systemd_cryptsetup_SOURCES = \
 
 systemd_cryptsetup_CFLAGS = \
        $(LIBCRYPTSETUP_CFLAGS) \
+       $(UDEV_CFLAGS) \
        $(AM_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
        $(LIBCRYPTSETUP_LIBS) \
+       $(UDEV_LIBS) \
        libsystemd-basic.la
 
 systemd_cryptsetup_generator_SOURCES = \
@@ -1100,8 +1119,12 @@ CLEANFILES += \
        ${XML_IN_FILES:.xml.in=.html.in}
 endif
 
+DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+
 org.freedesktop.systemd1.%.xml: systemd
-       $(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@
+       $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
 CLEANFILES += \
        $(dbusinterface_DATA)
@@ -1227,7 +1250,7 @@ install-data-hook:
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
-                       sysctl.service \
+                       systemd-sysctl.service \
                        systemd-ask-password-console.path && \
                $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
                $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
@@ -1238,7 +1261,7 @@ install-data-hook:
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
-               $(LN_S) ../sysctl.service sysctl.service && \
+               $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
                $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
@@ -1316,8 +1339,3 @@ upload: all distcheck
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
-
-# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
-fedora: install
-       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
-       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount