diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/Makefile.am b/Makefile.am index 6594cabdf6..532d5eeb86 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,12 +39,12 @@ SUBDIRS = . po .PRECIOUS: $(TEST_SUITE_LOG) Makefile LIBUDEV_CURRENT=7 -LIBUDEV_REVISION=3 +LIBUDEV_REVISION=4 LIBUDEV_AGE=6 -LIBSYSTEMD_CURRENT=7 +LIBSYSTEMD_CURRENT=8 LIBSYSTEMD_REVISION=0 -LIBSYSTEMD_AGE=7 +LIBSYSTEMD_AGE=8 # The following four libraries only exist for compatibility reasons, # their version info should not be bumped anymore @@ -338,10 +338,8 @@ INSTALL_EXEC_HOOKS += \ install-aliases-hook \ install-touch-usr-hook -if ENABLE_KDBUS INSTALL_EXEC_HOOKS += \ install-busnames-target-wants-hook -endif # ------------------------------------------------------------------------------ AM_V_M4 = $(AM_V_M4_$(V)) @@ -522,10 +520,8 @@ dist_systemunit_DATA = \ units/initrd-switch-root.target \ units/machines.target -if ENABLE_KDBUS dist_systemunit_DATA += \ $(dist_systemunit_DATA_busnames) -endif dist_systemunit_DATA_busnames += \ units/busnames.target @@ -704,11 +700,10 @@ noinst_DATA += \ CLEANFILES += \ man/index.html -XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml) NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES)) -SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES)) +SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))} -update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) +update-man-list: $(top_srcdir)/tools/make-man-rules.py $(SOURCE_XML_FILES) $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am @echo "Makefile-man.am has been regenerated" @@ -730,7 +725,7 @@ endif endif EXTRA_DIST += \ - $(XML_FILES) \ + $(filter-out man/systemd.directives.xml,$(XML_FILES)) \ $(HTML_FILES) \ $(HTML_ALIAS) \ $(man_MANS) \ @@ -739,7 +734,6 @@ EXTRA_DIST += \ tools/xml_helper.py \ man/systemd.index.xml \ man/index.html \ - man/systemd.directives.xml \ man/glib-event-glue.c \ $(NULL) @@ -2622,7 +2616,6 @@ systemd_gpt_auto_generator_CFLAGS = \ endif # ------------------------------------------------------------------------------ -if ENABLE_KDBUS systemgenerator_PROGRAMS += \ systemd-dbus1-generator @@ -2645,7 +2638,6 @@ dist_xinitrc_SCRIPTS = \ INSTALL_EXEC_HOOKS += dbus1-generator-install-hook UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook -endif # ------------------------------------------------------------------------------ systemd_sysv_generator_SOURCES = \ @@ -2793,7 +2785,6 @@ systemd_stdio_bridge_LDADD = \ libbus-proxy-core.la \ libshared.la -if ENABLE_KDBUS nodist_systemunit_DATA += \ units/systemd-bus-proxyd.service @@ -2805,7 +2796,6 @@ nodist_userunit_DATA += \ dist_userunit_DATA += \ units/user/systemd-bus-proxyd.socket -endif EXTRA_DIST += \ units/systemd-bus-proxyd.service.m4.in \ @@ -2971,14 +2961,6 @@ pkginclude_HEADERS += \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h -if ENABLE_KDBUS -pkginclude_HEADERS += \ - src/systemd/sd-utf8.h \ - src/systemd/sd-netlink.h \ - src/systemd/sd-resolve.h \ - src/systemd/sd-path.h -endif - lib_LTLIBRARIES += \ libsystemd.la @@ -6174,10 +6156,8 @@ USER_UNIT_ALIASES += \ $(systemunitdir)/sound.target sound.target \ $(systemunitdir)/smartcard.target smartcard.target -if ENABLE_KDBUS USER_UNIT_ALIASES += \ $(systemunitdir)/busnames.target busnames.target -endif GENERAL_ALIASES += \ $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \ @@ -6238,7 +6218,6 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ --with-rootprefix=$$dc_install_base \ - --enable-kdbus \ --enable-compat-libs if HAVE_SYSV_COMPAT @@ -6299,11 +6278,6 @@ hwdb-update: http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl ) -.PHONY: kdbus-update -kdbus-update: - ( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \ - wget -N https://d-bus.googlecode.com/git/kdbus.h ) - .PHONY: git-tag git-tag: git tag -s "v$(VERSION)" -m "systemd $(VERSION)" |