units: Tell login to preserve environment (#6023)

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4838df69f9b9183b6a0cae5b9f61707cf21058a9..c16e62280be792167b1b891fd37b79b6b5174c58 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=6
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=18
+LIBSYSTEMD_CURRENT=19
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=18
+LIBSYSTEMD_AGE=19
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -1624,6 +1624,7 @@ tests += \
        test-conf-parser \
        test-capability \
        test-async \
+       test-random-util \
        test-ratelimit \
        test-condition \
        test-uid-range \
@@ -1945,6 +1946,12 @@ test_fstab_util_SOURCES = \
 test_fstab_util_LDADD = \
        libsystemd-shared.la
 
+test_random_util_SOURCES = \
+       src/test/test-random-util.c
+
+test_random_util_LDADD = \
+       libsystemd-shared.la
+
 test_ratelimit_SOURCES = \
        src/test/test-ratelimit.c
 
@@ -3019,7 +3026,7 @@ efi_headers = \
        src/boot/efi/graphics.h \
        src/boot/efi/linux.h \
        src/boot/efi/measure.h \
-       src/boot/efi/pefile.h \
+       src/boot/efi/pe.h \
        src/boot/efi/splash.h \
        src/boot/efi/util.h \
        src/boot/efi/shim.h
@@ -3030,7 +3037,7 @@ systemd_boot_sources = \
        src/boot/efi/disk.c \
        src/boot/efi/graphics.c \
        src/boot/efi/measure.c \
-       src/boot/efi/pefile.c \
+       src/boot/efi/pe.c \
        src/boot/efi/util.c \
        src/boot/efi/shim.c
 
@@ -3067,7 +3074,7 @@ stub_sources = \
        src/boot/efi/graphics.c \
        src/boot/efi/linux.c \
        src/boot/efi/measure.c \
-       src/boot/efi/pefile.c \
+       src/boot/efi/pe.c \
        src/boot/efi/splash.c \
        src/boot/efi/stub.c \
        src/boot/efi/util.c
@@ -3871,6 +3878,7 @@ dist_udevrules_DATA += \
        rules/60-block.rules \
        rules/60-drm.rules \
        rules/60-evdev.rules \
+       rules/60-input-id.rules \
        rules/60-persistent-storage-tape.rules \
        rules/60-persistent-input.rules \
        rules/60-persistent-alsa.rules \
@@ -3878,6 +3886,7 @@ dist_udevrules_DATA += \
        rules/60-sensor.rules \
        rules/60-serial.rules \
        rules/64-btrfs.rules \
+       rules/70-joystick.rules \
        rules/70-mouse.rules \
        rules/70-touchpad.rules \
        rules/75-net-description.rules \
@@ -3924,10 +3933,10 @@ noinst_LTLIBRARIES += \
 
 src/udev/keyboard-keys-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
+       $(AM_V_GEN)$(top_srcdir)/src/udev/generate-keyboard-keys-list.sh "$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)" > $@
 
 src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key_name { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
+       $(AM_V_GEN)$(top_srcdir)/src/udev/generate-keyboard-keys-gperf.sh $< > $@
 
 src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
@@ -5757,6 +5766,7 @@ dist_zshcompletion_data += \
 tests += \
        test-dns-packet \
        test-resolve-tables \
+       test-resolved-packet \
        test-dnssec
 
 manual_tests += \
@@ -5778,6 +5788,19 @@ test_resolve_tables_LDADD = \
        $(GCRYPT_LIBS) \
        -lm
 
+test_resolved_packet_SOURCES = \
+       src/resolve/test-resolved-packet.c \
+       $(basic_dns_sources)
+
+test_resolved_packet_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(GCRYPT_CFLAGS)
+
+test_resolved_packet_LDADD = \
+       libsystemd-shared.la \
+       $(GCRYPT_LIBS) \
+       -lm
+
 test_dns_packet_SOURCES = \
        src/resolve/test-dns-packet.c \
        $(basic_dns_sources)