diff options
| author | DRC <dcommander@users.sourceforge.net> | 2015-02-23 19:03:29 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2015-02-23 19:03:29 +0000 |
| commit | 3b7015d5d88317c21876022b747ca5ec11e518f8 (patch) | |
| tree | 7f8ee229404446ad4df2f3c886401cc4a4dfdfb2 | |
| parent | cab2a8503ecbdc1778bc710895c8d39256d008c4 (diff) | |
| download | libjpeg-turbo-3b7015d5d88317c21876022b747ca5ec11e518f8.tar.gz | |
Enable silent build rules for the NASM objects, if the source is configured with automake 1.11 or later. NOTE: the build still spits out "error: ignoring unknown tag NASM" for each object, but unfortunately, if we remove "--tag NASM" from the command line, the build breaks under older versions of automake (it aborts with "unable to infer tagged configuration.")
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.4.x@1534 632fc199-4ca6-4c93-a231-07263d6284db
| -rw-r--r-- | simd/Makefile.am | 4 | ||||
| -rwxr-xr-x | simd/nasm_lt.sh | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/simd/Makefile.am b/simd/Makefile.am index 9605e68d..3029f1c9 100644 --- a/simd/Makefile.am +++ b/simd/Makefile.am @@ -73,7 +73,7 @@ endif AM_CPPFLAGS = -I$(top_srcdir) .asm.lo: - $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@ + $(AM_V_GEN) $(LIBTOOL) $(AM_V_lt) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(AM_V_lt) $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@ jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h - $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@ + $(AM_V_GEN) $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@ diff --git a/simd/nasm_lt.sh b/simd/nasm_lt.sh index 6cd73294..817be161 100755 --- a/simd/nasm_lt.sh +++ b/simd/nasm_lt.sh @@ -5,6 +5,9 @@ o_opt=no pic=no while [ $# -gt 0 ]; do case "$1" in + --silent) + exec > /dev/null + ;; -DPIC|-fPIC|-fpic|-Kpic|-KPIC) if [ "$pic" != "yes" ] ; then command="$command -DPIC" |