diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-15 01:31:23 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-15 01:31:23 -0400 |
| commit | 5caf817f3d48ea67893cd0b2e9c91f2f323a5356 (patch) | |
| tree | 7e5a31f4c78e3ad7959665c91e33ba32786fb217 /tools | |
| parent | c73c7c774cbd1f0e778254d51da819490a333ab4 (diff) | |
stuff
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/notsd-move | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/notsd-move b/tools/notsd-move index 0e8cc0dd87..5a907109bd 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -697,10 +697,6 @@ breakup_makefile() ( rm .tmp.move.all sed -ri \ - -e '/^ \$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \ - -e 's/ \$\(CFLAGS\) / /g' \ - -e 's/ \$\(CPPFLAGS\) / /g' \ - -e 's/ \$\(AM_CPPFLAGS\) / $(sd.ALL_CPPFLAGS) /g' \ -e '/^[^# ]*:/ { s|\S+/|$(outdir)/|g }' \ src/libbasic/include/basic/Makefile \ src/libsystemd/src/Makefile \ @@ -745,8 +741,13 @@ breakup_makefile() ( fixup_makefile() { sed -r \ + -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 '/\bAM_(C|CPP|LD)FLAGS\b/d' \ -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g' } |