resolved: respond to local resolver requests on 127.0.0.53:53

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d2336144034273573c3ecc2eb603cb5cbf4ff0a1..c7e4c20c49c351d42022aac7031988dfab5384bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -125,6 +125,7 @@ dist_systemunit_DATA_busnames =
 dist_sysusers_DATA =
 check_PROGRAMS =
 check_DATA =
+dist_rootlibexec_DATA =
 tests=
 manual_tests =
 TEST_EXTENSIONS = .py
@@ -141,6 +142,10 @@ else
 noinst_PROGRAMS =
 TESTS =
 endif
+AM_TESTS_ENVIRONMENT = \
+       export SYSTEMD_KBD_MODEL_MAP=$(abs_top_srcdir)/src/locale/kbd-model-map; \
+       export SYSTEMD_LANGUAGE_FALLBACK_MAP=$(abs_top_srcdir)/src/locale/language-fallback-map;
+
 if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA = $(dist_bashcompletion_data)
 nodist_bashcompletion_DATA = $(nodist_bashcompletion_data)
@@ -213,6 +218,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/shared \
        -I $(top_builddir)/src/shared \
        -I $(top_srcdir)/src/network \
+       -I $(top_srcdir)/src/locale \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/journal \
        -I $(top_builddir)/src/journal \
@@ -2897,29 +2903,9 @@ systemd_gpt_auto_generator_CFLAGS = \
 endif
 
 # ------------------------------------------------------------------------------
-systemgenerator_PROGRAMS +=  \
-       systemd-dbus1-generator
-
-systemd_dbus1_generator_SOURCES = \
-       src/dbus1-generator/dbus1-generator.c
-
-systemd_dbus1_generator_LDADD = \
-       libshared.la
-
-dbus1-generator-install-hook:
-       $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
-       $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-       $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-
-dbus1-generator-uninstall-hook:
-       rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-
 dist_xinitrc_SCRIPTS = \
        xorg/50-systemd-user.sh
 
-INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
-UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
-
 # ------------------------------------------------------------------------------
 systemd_sysv_generator_SOURCES = \
        src/sysv-generator/sysv-generator.c
@@ -4746,7 +4732,9 @@ BUSNAMES_TARGET_WANTS += \
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
-       src/locale/localed.c
+       src/locale/localed.c \
+       src/locale/keymap-util.c \
+       src/locale/keymap-util.h
 
 systemd_localed_LDADD = \
        libshared.la \
@@ -4784,6 +4772,18 @@ dist_pkgdata_DATA = \
        src/locale/kbd-model-map \
        src/locale/language-fallback-map
 
+test_keymap_util_SOURCES = \
+       src/locale/test-keymap-util.c \
+       src/locale/keymap-util.c \
+       src/locale/keymap-util.h
+
+test_keymap_util_LDADD = \
+       libshared.la \
+       -ldl
+
+tests += \
+       test-keymap-util
+
 localectl_SOURCES = \
        src/locale/localectl.c
 
@@ -5148,7 +5148,7 @@ systemd_export_LDADD = \
        $(ZLIB_LIBS) \
        -lbz2
 
-dist_rootlibexec_DATA = \
+dist_rootlibexec_DATA += \
        src/import/import-pubring.gpg
 
 nodist_systemunit_DATA += \
@@ -5260,6 +5260,8 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-dns-stream.c \
        src/resolve/resolved-dns-trust-anchor.h \
        src/resolve/resolved-dns-trust-anchor.c \
+       src/resolve/resolved-dns-stub.h \
+       src/resolve/resolved-dns-stub.c \
        src/resolve/resolved-etc-hosts.h \
        src/resolve/resolved-etc-hosts.c \
        src/shared/gcrypt-util.c \
@@ -5412,6 +5414,9 @@ EXTRA_DIST += \
        units/systemd-resolved.service.m4.in \
        src/resolve/resolved.conf.in
 
+dist_rootlibexec_DATA += \
+       src/resolve/resolv.conf
+
 # ------------------------------------------------------------------------------
 if ENABLE_NETWORKD
 rootlibexec_PROGRAMS += \
@@ -5443,6 +5448,8 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-link.c \
        src/network/networkd-netdev.h \
        src/network/networkd-netdev.c \
+       src/network/networkd-netdev-vrf.h \
+       src/network/networkd-netdev-vrf.c \
        src/network/networkd-netdev-tunnel.h \
        src/network/networkd-netdev-tunnel.c \
        src/network/networkd-netdev-veth.h \
@@ -5480,6 +5487,8 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-manager-bus.c \
        src/network/networkd-fdb.h \
        src/network/networkd-fdb.c \
+       src/network/networkd-brvlan.h \
+       src/network/networkd-brvlan.c \
        src/network/networkd-address-pool.h \
        src/network/networkd-address-pool.c \
        src/network/networkd-util.h \
@@ -6256,7 +6265,11 @@ hwdb-update:
        wget -O ma-large.txt 'http://standards.ieee.org/develop/regauth/oui/oui.txt' && \
        wget -O ma-medium.txt 'http://standards.ieee.org/develop/regauth/oui28/mam.txt' && \
        wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \
-       ./ids-update.pl )
+       wget -O pnp_id_registry.html 'http://www.uefi.org/uefi-pnp-export' && \
+       wget -O acpi_id_registry.html 'http://www.uefi.org/uefi-acpi-export' && \
+       ./ids-update.pl && \
+       ./acpi-update.py > 20-acpi-vendor.hwdb.base && \
+       patch -p0 -o- 20-acpi-vendor.hwdb.base < 20-acpi-vendor.hwdb.patch > 20-acpi-vendor.hwdb )
 
 .PHONY: built-sources
 built-sources: $(BUILT_SOURCES)