diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-26 23:39:19 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-26 23:39:19 -0400 |
| commit | 7888137c2695828443b5d7488e6e33f7da74e0a5 (patch) | |
| tree | 9cd993b2d63d5cfbd837ed2d78d4ec488b67c0e1 | |
| parent | 34389c8372e65844696196fc4db7b0d3046c6a37 (diff) | |
fixity
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rwxr-xr-x | tools/notsd-move | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 8154394e84..09beac93d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5650,7 +5650,7 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_systemd-resolve -#@src/grp-resolve/libbasic-dns/src/Makefile +#@src/grp-resolve/libbasic-dns/test/Makefile tests += \ test-dns-packet \ test-resolve-tables \ @@ -5728,7 +5728,7 @@ test_dnssec_complex_LDADD = \ #@auto/systemd-resolved/Makefile endif # ENABLE_RESOLVED -#@auto/libbasic-dns/Makefile +#@src/grp-resolve/libbasic-dns/src/Makefile gperf_txt_sources += \ src/resolve/dns_type-list.txt @@ -6829,7 +6829,6 @@ sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) #@src/grp-machine/libmachine-core/Makefile #@src/grp-resolve/Makefile #@src/grp-resolve/libbasic-dns/Makefile -#@src/grp-resolve/libbasic-dns/test/Makefile #@src/grp-system/Makefile #@src/grp-system/grp-utils/Makefile #@src/grp-system/libcore/Makefile diff --git a/tools/notsd-move b/tools/notsd-move index c7a9b99e0b..36ca546a63 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -780,19 +780,23 @@ fixup_makefile() { -e '#### Specific complete strings #####' \ -e 's|\$\(CPP\) \$\(CFLAGS\) \$\(AM_CPPFLAGS\) \$\(CPPFLAGS\)|$(CPP) $(sd.ALL_CPPFLAGS)|g' \ -e '/^ \$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \ + \ -e '#### General cases #################' \ -e '/^[^# ]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \ -e 's|^if (.*)|ifneq ($(\1),)|' \ -e '/^\s*\$\(AM_(C|CPP|LD)FLAGS\b/d' \ -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g' \ + \ -e '#### Rename helpers ################' \ -e 's|libbasic_la|libsystemd_basic_la|g' \ -e 's|libbasic|libsystemd-basic|g' \ - -e 's|libshared|libsystemd-shared|g' \ + -e 's|libsystemd-basic-dns|libbasic-dns|g' \ + \ -e 's|libshared_la|libsystemd_shared_la|g' \ - -e 's|libfirewall|libsystemd-firewall|g' \ + -e 's|libshared|libsystemd-shared|g' \ + \ -e 's|libfirewall_la|libsystemd_firewall_la|g' \ - -e 's|libsystemd-basic-dns|libbasic-dns|g' + -e 's|libfirewall|libsystemd-firewall|g' } breakup_zshcompletion() ( |