diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rwxr-xr-x | tools/notsd-move | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index b1c28551a4..1dabbb0819 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4362,8 +4362,10 @@ test_compress_LDADD = \ libsystemd-shared.la if HAVE_LZ4 +test_compress_CFLAGS += \ + $(LZ4_CFLAGA) test_compress_LDADD += \ - -llz4 + $(LZ4_LIBS) endif test_compress_benchmark_SOURCES = \ 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' } |