diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 02:15:47 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 02:15:47 -0400 |
| commit | e7af93b77b33c6cb9241d5c72283357682394a96 (patch) | |
| tree | beb1e68301bb5c7e89b790c11ec47a964156d9fc | |
| parent | 3575368a3a49f650131f0336f6787c4ba592ffca (diff) | |
| parent | 2c53ed5f62d71c3347df865a8dd1677b560225f9 (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | move.sh | 4 | ||||
| -rw-r--r-- | src/libshared/test-local-addresses.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c) | 0 |
3 files changed, 6 insertions, 0 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/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 |