udev: net-config - allow interface names to be set from the hwdb

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d93b05a5e6264c8956f94189a8f5966f2b7a4868..02a1aaef08ae8b8ad66595a2758eeda96293e85e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1925,7 +1925,6 @@ systemd_tty_ask_password_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
@@ -1991,6 +1990,7 @@ libsystemd_internal_la_SOURCES = \
        src/login/login-shared.h
 
 nodist_libsystemd_internal_la_SOURCES = \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
 libsystemd_internal_la_CFLAGS = \
@@ -2012,14 +2012,19 @@ noinst_LTLIBRARIES += \
        libsystemd-dump.la
 
 EXTRA_DIST += \
+       src/libsystemd/libsystemd.sym.m4 \
+       src/libsystemd/libsystemd.pc.in \
        src/libsystemd/sd-bus/bus-error-mapping.gperf \
        src/libsystemd/sd-bus/DIFFERENCES \
-       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
-       src/libsystemd/libsystemd.pc.in
+       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
 CLEANFILES += \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
+BUILT_SOURCES += \
+       src/libsystemd/libsystemd.sym
+
 libsystemd_la_SOURCES = \
        $(libsystemd_internal_la_SOURCES) \
        $(libsystemd_journal_internal_la_SOURCES)
@@ -2028,12 +2033,13 @@ nodist_libsystemd_la_SOURCES = \
        $(nodist_libsystemd_internal_la_SOURCES)
 
 libsystemd_la_CFLAGS = \
-       $(libsystemd_internal_la_CFLAGS)
+       $(libsystemd_internal_la_CFLAGS) \
+       $(libsystemd_journal_internal_la_CFLAGS)
 
 libsystemd_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
+       -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
 
 libsystemd_la_LIBADD = \
        libsystemd-shared.la \
@@ -2457,6 +2463,7 @@ dist_udevhwdb_DATA = \
        hwdb/20-bluetooth-vendor-product.hwdb \
        hwdb/20-acpi-vendor.hwdb \
        hwdb/20-OUI.hwdb \
+       hwdb/20-net-ifname.hwdb \
        hwdb/60-keyboard.hwdb
 
 udevconfdir = $(sysconfdir)/udev
@@ -3196,6 +3203,7 @@ libsystemd_journal_internal_la_SOURCES += \
 libsystemd_journal_internal_la_LIBADD += \
        $(GCRYPT_LIBS)
 
+# fsprg.c is a drop-in file using void pointer arithmetic
 libsystemd_journal_internal_la_CFLAGS += \
        $(GCRYPT_CFLAGS) \
        -Wno-pointer-arith
@@ -4754,7 +4762,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
        --with-rootprefix=$$dc_install_base \
        --disable-split-usr \
-       --enable-kdbus
+       --enable-kdbus \
+       --enable-compat-libs
 
 if HAVE_SYSV_COMPAT
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -4877,7 +4886,7 @@ define generate-sym-test
 endef
 
 test-libsystemd-sym.c: \
-               src/libsystemd/libsystemd.sym \
+               $(top_builddir)/src/libsystemd/libsystemd.sym \
                src/systemd/sd-journal.h \
                src/systemd/sd-daemon.h \
                src/systemd/sd-login.h \