chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
build-sys: move most of HAVE_KMOD into one section
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 9c92bffc01f3672127367cb7575156ddef4b634f..f2b8fb41bd44222ad4847b1a0cf39fdae0e50224 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,9 @@ SUBDIRS = . po
 # remove targets if the command fails
 .DELETE_ON_ERROR:
 
+# keep intermediate files
+.SECONDARY:
+
 LIBUDEV_CURRENT=3
 LIBUDEV_REVISION=1
 LIBUDEV_AGE=2
@@ -292,11 +295,6 @@ rootlibexec_PROGRAMS = \
        systemd-sysctl \
        systemd-sleep
 
-if HAVE_KMOD
-rootlibexec_PROGRAMS += \
-       systemd-modules-load
-endif
-
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
@@ -410,11 +408,6 @@ nodist_systemunit_DATA = \
        units/systemd-udev-settle.service \
        units/debug-shell.service
 
-if HAVE_KMOD
-nodist_systemunit_DATA += \
-       units/systemd-modules-load.service
-endif
-
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -458,8 +451,10 @@ EXTRA_DIST += \
        introspect.awk \
        man/custom-html.xsl
 
-EXTRA_DIST += \
-       units/systemd-modules-load.service.in
+CLEANFILES += \
+       units/console-shell.service.m4 \
+       units/console-getty.service.m4 \
+       units/rescue.service.m4
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
@@ -637,6 +632,8 @@ MANPAGES_ALIAS = \
        man/SD_JOURNAL_INVALIDATE.3 \
        man/sd_journal_add_disjunction.3 \
        man/sd_journal_flush_matches.3 \
+       man/sd_journal_get_data_threshold.3 \
+       man/sd_journal_set_data_threshold.3 \
        man/sd_journal_seek_tail.3 \
        man/sd_journal_seek_monotonic_usec.3 \
        man/sd_journal_seek_realtime_usec.3 \
@@ -647,15 +644,6 @@ MANPAGES_ALIAS = \
        man/SD_JOURNAL_FOREACH_UNIQUE.3 \
        man/sd_journal_get_catalog_for_message_id.3
 
-if HAVE_KMOD
-MANPAGES += \
-       man/modules-load.d.5 \
-       man/systemd-modules-load.service.8
-MANPAGES_ALIAS += \
-       man/systemd-modules-load.8
-man/systemd-modules-load.8: man/systemd-modules-load.service.8
-endif
-
 if HAVE_MICROHTTPD
 MANPAGES += \
        man/systemd-journal-gatewayd.service.8
@@ -735,6 +723,8 @@ man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
 man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
 man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
 man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
+man/sd_journal_get_data_threshold.3: man/sd_journal_get_data.3
+man/sd_journal_set_data_threshold.3: man/sd_journal_get_data.3
 man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
 man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
 man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
@@ -899,6 +889,8 @@ noinst_LTLIBRARIES += \
 libsystemd_units_la_SOURCES = \
        src/shared/install.c \
        src/shared/install.h \
+       src/shared/install-printf.c \
+       src/shared/install-printf.h \
        src/shared/path-lookup.c \
        src/shared/path-lookup.h
 
@@ -1234,7 +1226,8 @@ EXTRA_DIST += \
        src/core/macros.systemd.in
 
 CLEANFILES += \
-       src/core/macros.systemd
+       src/core/macros.systemd \
+       src/core/org.freedesktop.systemd1.policy.in
 
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
@@ -1321,6 +1314,10 @@ test_efivars_LDADD = \
 test_unit_name_SOURCES = \
        src/test/test-unit-name.c
 
+test_unit_name_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
 test_unit_name_LDADD = \
        libsystemd-core.la
 
@@ -1401,7 +1398,8 @@ test_strv_SOURCES = \
        src/test/test-strv.c
 
 test_strv_LDADD = \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-id128-internal.la
 
 test_install_SOURCES = \
        src/test/test-install.c
@@ -1413,7 +1411,8 @@ test_install_CFLAGS = \
 test_install_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-id128-internal.la
 
 test_watchdog_SOURCES = \
        src/test/test-watchdog.c
@@ -1487,8 +1486,8 @@ systemd_shutdown_LDADD = \
        libsystemd-shared.la \
        libudev.la
 
-if HAVE_KMOD
 # ------------------------------------------------------------------------------
+if HAVE_KMOD
 systemd_modules_load_SOURCES = \
        src/modules-load/modules-load.c
 
@@ -1499,8 +1498,29 @@ systemd_modules_load_CFLAGS = \
 systemd_modules_load_LDADD = \
        libsystemd-shared.la \
        $(KMOD_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-modules-load
+
+nodist_systemunit_DATA += \
+       units/systemd-modules-load.service
+SYSINIT_TARGET_WANTS += \
+       systemd-modules-load.service
+
+dist_udevrules_DATA += \
+       rules/80-drivers.rules
+
+MANPAGES += \
+       man/modules-load.d.5 \
+       man/systemd-modules-load.service.8
+MANPAGES_ALIAS += \
+       man/systemd-modules-load.8
+man/systemd-modules-load.8: man/systemd-modules-load.service.8
 endif
 
+EXTRA_DIST += \
+       units/systemd-modules-load.service.in
+
 # ------------------------------------------------------------------------------
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles/tmpfiles.c
@@ -1915,11 +1935,6 @@ dist_udevrules_DATA += \
        rules/80-net-name-slot.rules \
        rules/95-udev-late.rules
 
-if HAVE_KMOD
-dist_udevrules_DATA += \
-       rules/80-drivers.rules
-endif
-
 dist_udevhwdb_DATA = \
        hwdb/20-pci-vendor-product.hwdb \
        hwdb/20-pci-classes.hwdb \
@@ -2410,6 +2425,7 @@ dist_udevkeymap_DATA = \
        keymaps/hewlett-packard-tablet \
        keymaps/hewlett-packard-tx2 \
        keymaps/hewlett-packard_elitebook-8440p \
+       keymaps/hewlett-packard-hdx9494nr \
        keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        keymaps/inventec-symphony_6.0_7.0 \
        keymaps/lenovo-3000 \
@@ -3863,19 +3879,13 @@ src/%: src/%.m4
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
-M4_PROCESS_SYSTEM = \
-       $(AM_V_M4)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
-
-M4_PROCESS_USER = \
-       $(AM_V_M4)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
-
 units/%: units/%.m4 Makefile
-       $(M4_PROCESS_SYSTEM)
+       $(AM_V_M4)$(MKDIR_P) $(dir $@)
+       $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 units/user/%: units/%.m4 Makefile
-       $(M4_PROCESS_USER)
+       $(AM_V_M4)$(MKDIR_P) $(dir $@)
+       $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 nodist_polkitpolicy_DATA = \
        $(polkitpolicy_files) \
@@ -4057,11 +4067,6 @@ INSTALL_DIRS += \
        $(dbussessionservicedir) \
        $(sysconfdir)/xdg/systemd
 
-if HAVE_KMOD
-SYSINIT_TARGET_WANTS += \
-       systemd-modules-load.service
-endif
-
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
Unnamed repository; edit this file 'description' to name the repository.