chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sysctl: always write net.ipv4.conf.all.xyz= in addition to net.ipv4.conf.default...
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 73aa4209ce58cd3b245ad5cc55cd71a9f46baac3..b95ddf2b4cb06896a8bae1c74f6c0898f8cbd42b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,6 +201,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/timedate \
        -I $(top_srcdir)/src/timesync \
        -I $(top_srcdir)/src/resolve \
+       -I $(top_builddir)/src/resolve \
        -I $(top_srcdir)/src/systemd \
        -I $(top_builddir)/src/core \
        -I $(top_srcdir)/src/core \
@@ -211,6 +212,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/libsystemd/sd-bus \
        -I $(top_srcdir)/src/libsystemd/sd-event \
        -I $(top_srcdir)/src/libsystemd/sd-rtnl \
+       -I $(top_srcdir)/src/libsystemd/sd-network \
        -I $(top_srcdir)/src/libsystemd-network \
        -I $(top_srcdir)/src/libsystemd-terminal \
        $(OUR_CPPFLAGS)
@@ -488,8 +490,7 @@ dist_systemunit_DATA = \
        units/systemd-udevd-control.socket \
        units/systemd-udevd-kernel.socket \
        units/system-update.target \
-       units/initrd-switch-root.target \
-       units/ldconfig.service
+       units/initrd-switch-root.target
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -832,6 +833,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/errno-list.h \
        src/shared/af-list.c \
        src/shared/af-list.h \
+       src/shared/arphrd-list.c \
+       src/shared/arphrd-list.h \
        src/shared/audit.c \
        src/shared/audit.h \
        src/shared/xml.c \
@@ -863,7 +866,9 @@ nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
        src/shared/errno-to-name.h \
        src/shared/af-from-name.h \
-       src/shared/af-to-name.h
+       src/shared/af-to-name.h \
+       src/shared/arphrd-from-name.h \
+       src/shared/arphrd-to-name.h
 
 libsystemd_shared_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -913,6 +918,16 @@ libsystemd_label_la_CFLAGS = \
 libsystemd_label_la_LIBADD = \
        $(SELINUX_LIBS)
 
+# -----------------------------------------------------------------------------
+
+if ENABLE_LDCONFIG
+dist_systemunit_DATA += \
+       units/ldconfig.service
+
+SYSINIT_TARGET_WANTS += \
+       ldconfig.service
+endif
+
 # ------------------------------------------------------------------------------
 
 if HAVE_SECCOMP
@@ -1148,24 +1163,32 @@ CLEANFILES += \
        src/shared/errno-list.txt \
        src/shared/errno-from-name.gperf \
        src/shared/af-list.txt \
-       src/shared/af-from-name.gperf
+       src/shared/af-from-name.gperf \
+       src/shared/arphrd-list.txt \
+       src/shared/arphrd-from-name.gperf \
+       src/shared/dns_type-list.txt \
+       src/shared/dns_type-from-name.gperf
 
 BUILT_SOURCES += \
        src/shared/errno-from-name.h \
        src/shared/errno-to-name.h \
        src/shared/af-from-name.h \
-       src/shared/af-to-name.h
+       src/shared/af-to-name.h \
+       src/shared/arphrd-from-name.h \
+       src/shared/arphrd-to-name.h \
+       src/resolve/dns_type-from-name.h \
+       src/resolve/dns_type-to-name.h
 
-src/shared/%-from-name.gperf: src/shared/%-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $*_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
+%-from-name.gperf: %-list.txt
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
 
-src/shared/%-from-name.h: src/shared/%-from-name.gperf
-       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$* -H hash_$*_name -p -C <$< >$@
+%-from-name.h: %-from-name.gperf
+       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@
 
 
 src/shared/errno-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }'  >$@
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
 
 src/shared/errno-to-name.h: src/shared/errno-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
@@ -1173,11 +1196,32 @@ src/shared/errno-to-name.h: src/shared/errno-list.txt
 
 src/shared/af-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }'  >$@
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
 
 src/shared/af-to-name.h: src/shared/af-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
+src/shared/arphrd-list.txt:
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
+
+src/shared/arphrd-to-name.h: src/shared/arphrd-list.txt
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
+src/shared/arphrd-from-name.gperf: src/shared/arphrd-list.txt
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
+
+
+src/resolve/dns_type-list.txt: src/resolve/dns-type.h
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@
+
+src/resolve/dns_type-to-name.h: src/resolve/dns_type-list.txt
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print "\ndefault: return NULL;\n\t}\n}\n" }' <$< >$@
+
+src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@
+
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
        src/core/main.c
@@ -2347,6 +2391,7 @@ libsystemd_internal_la_SOURCES = \
        src/systemd/sd-id128.h \
        src/systemd/sd-daemon.h \
        src/systemd/sd-path.h \
+       src/systemd/sd-network.h \
        src/libsystemd/sd-bus/sd-bus.c \
        src/libsystemd/sd-bus/bus-control.c \
        src/libsystemd/sd-bus/bus-control.h \
@@ -2403,7 +2448,10 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-id128/sd-id128.c \
        src/libsystemd/sd-daemon/sd-daemon.c \
        src/libsystemd/sd-login/sd-login.c \
-       src/libsystemd/sd-path/sd-path.c
+       src/libsystemd/sd-path/sd-path.c \
+       src/libsystemd/sd-network/sd-network.c \
+       src/libsystemd/sd-network/network-util.h \
+       src/libsystemd/sd-network/network-util.c
 
 nodist_libsystemd_internal_la_SOURCES = \
        src/libsystemd/libsystemd.sym \
@@ -2754,13 +2802,13 @@ libsystemd_network_la_CFLAGS = \
        $(KMOD_CFLAGS)
 
 libsystemd_network_la_SOURCES = \
-       src/systemd/sd-network.h \
        src/systemd/sd-dhcp-client.h \
        src/systemd/sd-dhcp-server.h \
        src/systemd/sd-dhcp-lease.h \
        src/systemd/sd-ipv4ll.h \
-       src/network/sd-network.c \
-       src/network/network-util.h \
+       src/systemd/sd-icmp6-nd.h \
+       src/systemd/sd-dhcp6-client.h \
+       src/systemd/sd-dhcp6-lease.h \
        src/libsystemd-network/sd-dhcp-client.c \
        src/libsystemd-network/sd-dhcp-server.c \
        src/libsystemd-network/dhcp-network.c \
@@ -2777,9 +2825,6 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/ipv4ll-internal.h \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
-       src/systemd/sd-icmp6-nd.h \
-       src/systemd/sd-dhcp6-client.h \
-       src/systemd/sd-dhcp6-lease.h \
        src/libsystemd-network/sd-icmp6-nd.c \
        src/libsystemd-network/sd-dhcp6-client.c \
        src/libsystemd-network/dhcp6-internal.h \
@@ -4558,7 +4603,12 @@ EXTRA_DIST += \
 if ENABLE_TIMESYNCD
 systemd_timesyncd_SOURCES = \
        src/timesync/timesyncd.c \
-       src/timesync/timesyncd.h
+       src/timesync/timesyncd-manager.c \
+       src/timesync/timesyncd-manager.h \
+       src/timesync/timesyncd-conf.c \
+       src/timesync/timesyncd-conf.h \
+       src/timesync/timesyncd-server.c \
+       src/timesync/timesyncd-server.h
 
 nodist_systemd_timesyncd_SOURCES = \
        src/timesync/timesyncd-gperf.c
@@ -4731,6 +4781,7 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-bus.h \
        src/resolve/resolved-link.h \
        src/resolve/resolved-link.c \
+       src/resolve/resolved-def.h \
        src/resolve/resolved-dns-domain.h \
        src/resolve/resolved-dns-domain.c \
        src/resolve/resolved-dns-rr.h \
@@ -4754,13 +4805,18 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-dns-zone.h \
        src/resolve/resolved-dns-zone.c \
        src/resolve/resolved-dns-stream.h \
-       src/resolve/resolved-dns-stream.c
+       src/resolve/resolved-dns-stream.c \
+       src/resolve/dns-type.c \
+       src/resolve/dns-type.h \
+       src/resolve/dns_type-from-name.h \
+       src/resolve/dns_type-to-name.h
 
 nodist_systemd_resolved_SOURCES = \
        src/resolve/resolved-gperf.c
 
 EXTRA_DIST += \
-       src/resolve/resolved-gperf.gperf
+       src/resolve/resolved-gperf.gperf \
+       src/resolve/dns_type-from-name.gperf
 
 CLEANFILES += \
        src/resolve/resolved-gperf.c
@@ -4857,7 +4913,11 @@ systemd_resolve_host_SOURCES = \
        src/resolve/resolved-dns-question.c \
        src/resolve/resolved-dns-question.h \
        src/resolve/resolved-dns-domain.c \
-       src/resolve/resolved-dns-domain.h
+       src/resolve/resolved-dns-domain.h \
+       src/resolve/dns-type.c \
+       src/resolve/dns-type.h \
+       src/resolve/dns_type-from-name.h \
+       src/resolve/dns_type-to-name.h
 
 systemd_resolve_host_LDADD = \
        libsystemd-internal.la \
@@ -4891,6 +4951,7 @@ libsystemd_networkd_core_la_CFLAGS = \
 libsystemd_networkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd.h \
+       src/network/networkd-link.h \
        src/network/networkd-netdev.h \
        src/network/networkd-netdev-tunnel.h \
        src/network/networkd-netdev-veth.h \
@@ -4912,6 +4973,8 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-netdev-bond.c \
        src/network/networkd-netdev-bridge.c \
        src/network/networkd-link.c \
+       src/network/networkd-ipv4ll.c \
+       src/network/networkd-dhcp4.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -4949,6 +5012,18 @@ systemd_networkd_wait_online_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+rootbin_PROGRAMS += \
+       networkctl
+
+networkctl_SOURCES = \
+       src/network/networkctl.c
+
+networkctl_LDADD = \
+       libsystemd-internal.la \
+       libudev-internal.la \
+       libsystemd-shared.la \
+       libsystemd-network.la
+
 test_network_SOURCES = \
        src/network/test-network.c
 
@@ -5724,8 +5799,7 @@ endif
 
 SYSINIT_TARGET_WANTS += \
        systemd-update-utmp.service \
-       systemd-update-done.service \
-       ldconfig.service
+       systemd-update-done.service
 
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
Unnamed repository; edit this file 'description' to name the repository.