diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | move.sh | 4 | ||||
| -rw-r--r-- | src/libshared/Makefile | 6 | ||||
| -rw-r--r-- | src/libshared/local-addresses.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c) | 0 | ||||
| -rw-r--r-- | src/libshared/local-addresses.h (renamed from src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h) | 0 | ||||
| -rw-r--r-- | src/libshared/test-local-addresses.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/libsystemd-internal/Makefile | 6 |
7 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 8545419c1c..f009885501 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3403,12 +3403,14 @@ test_netlink_SOURCES = \ test_netlink_LDADD = \ libshared.la +#@src/libshared/Makefile test_local_addresses_SOURCES = \ src/libsystemd/sd-netlink/test-local-addresses.c test_local_addresses_LDADD = \ libshared.la +#@src/libsystemd/libsystemd-internal/Makefile test_resolve_SOURCES = \ src/libsystemd/sd-resolve/test-resolve.c @@ -185,6 +185,10 @@ move_files() ( mv -T src/timedate src/grp-timedate/systemd-timedated mkdir src/grp-timedate/timedatectl mv -T src/grp-timedate/{systemd-timedated,timedatectl}/timedatectl.c + + mv -T src/{libsystemd/libsystemd-internal/sd-netlink,libshared}/local-addresses.c + mv -T src/{libsystemd/libsystemd-internal/sd-netlink,libshared}/local-addresses.h + mv -T src/{libsystemd/libsystemd-internal/sd-netlink,libshared}/test-local-addresses.c ) breakup_makefile() ( diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 3c229062e8..e58f999e2b 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -137,5 +137,11 @@ libshared_la_LIBADD = \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) +test_local_addresses_SOURCES = \ + src/libsystemd/sd-netlink/test-local-addresses.c + +test_local_addresses_LDADD = \ + libshared.la + $(eval $(value automake2autothing)) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c b/src/libshared/local-addresses.c index e6feb859cd..e6feb859cd 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c +++ b/src/libshared/local-addresses.c diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h b/src/libshared/local-addresses.h index 1ddc50ace5..1ddc50ace5 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h +++ b/src/libshared/local-addresses.h diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c b/src/libshared/test-local-addresses.c index e0e28cc0cc..e0e28cc0cc 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c +++ b/src/libshared/test-local-addresses.c diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index 086e904d0e..23090bd7be 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -244,12 +244,6 @@ test_netlink_SOURCES = \ test_netlink_LDADD = \ libshared.la -test_local_addresses_SOURCES = \ - src/libsystemd/sd-netlink/test-local-addresses.c - -test_local_addresses_LDADD = \ - libshared.la - test_resolve_SOURCES = \ src/libsystemd/sd-resolve/test-resolve.c |