chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: get rid of special fedor install target
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 06cd3c55c6a3b2f6873b91783a73876d8a4ca0bc..d7a279c152297ce7586961d5a5026ec3d602e8a2 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-317,7
+317,8
@@
EXTRA_DIST = \
units/fsck@.service.in \
units/fsck-root.service.in \
units/quotacheck.service.in \
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 += \
if TARGET_FEDORA
dist_systemunit_DATA += \
@@
-508,7
+509,9
@@
MANPAGES = \
man/tmpfiles.d.5 \
man/hostname.5 \
man/vconsole.conf.5 \
man/tmpfiles.d.5 \
man/hostname.5 \
man/vconsole.conf.5 \
- man/locale.conf.5
+ man/locale.conf.5 \
+ man/os-release.5 \
+ man/modules-load.d.5
MANPAGES_ALIAS = \
man/reboot.8 \
MANPAGES_ALIAS = \
man/reboot.8 \
@@
-1116,8
+1119,12
@@
CLEANFILES += \
${XML_IN_FILES:.xml.in=.html.in}
endif
${XML_IN_FILES:.xml.in=.html.in}
endif
+DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+
org.freedesktop.systemd1.%.xml: systemd
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)
CLEANFILES += \
$(dbusinterface_DATA)
@@
-1332,8
+1339,3
@@
upload: all distcheck
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
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