Set plugin filename in global.inc; enable more silent builds

global.inc

@@ -17,6 +17,8 @@ define asmcompile
 	$(YASM_silent)$(YASM) $(VSASFLAGS) $(ASMINC) $(ASFLAGS) -o $@ $<
 endef
 
+LIB = $(LIBNAME).so
+
 commonflags  = -c -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror=format-security
 commonflags += -fPIC -fstack-protector-all -fno-strict-aliasing -mfpmath=sse -msse2
 commonflags += -DVS_TARGET_CPU_X86 -D_FORTIFY_SOURCE=2

plugins/addgrain/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libaddgrain.so
+LIBNAME = addgrain
 
 include ../../cxx.inc
 

plugins/awarpsharp2/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libawarpsharp2.so
+LIBNAME = awarpsharp2
 
 local_CXXFLAGS = -DAWARPSHARP2_X86
 

plugins/bifrost/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libbifrost.so
+LIBNAME = bifrost
 
 include ../../cc.inc
 

plugins/bilateral/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libbilateral.so
+LIBNAME = bilateral
 
 include ../../cxx.inc
 

plugins/bm3d/Makefile

@@ -2,7 +2,7 @@ include ../../config.mak
 
 ifeq ($(HAVE_FFTW3F),yes)
 ifeq ($(HAVE_FFTW3F_NEWER),yes)
-LIB = libbm3d.so
+LIBNAME = bm3d
 local_CXXFLAGS = -Wno-unused-local-typedefs
 LIBADD = -lfftw3f
 endif

plugins/combmask/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libcombmask.so
+LIBNAME = combmask
 
 include ../../cc.inc
 

plugins/convo2d/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libconvo2d.so
+LIBNAME = convo2d
 
 include ../../cc.inc
 

plugins/ctmf/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libctmf.so
+LIBNAME = ctmf
 
 include ../../cxx.inc
 

plugins/d2vsource/Makefile

@@ -4,7 +4,7 @@ ifeq ($(HAVE_AVCODEC),yes)
 ifeq ($(HAVE_AVFORMAT),yes)
 ifeq ($(HAVE_AVUTIL),yes)
 
-LIB = libd2vsource.so
+LIBNAME = d2vsource
 local_CXXFLAGS = -Wno-sign-compare
 LIBADD = -lavcodec -lavformat -lavutil
 

plugins/damb/Makefile

@@ -1,7 +1,7 @@
 include ../../config.mak
 
 ifeq ($(HAVE_SNDFILE),yes)
-LIB = libdamb.so
+LIBNAME = damb
 LIBADD = -lsndfile
 endif
 

plugins/dctfilter/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libdctfilter.so
+LIBNAME = dctfilter
 LIBADD = -lm
 
 include ../../cc.inc

plugins/deblock/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libdeblock.so
+LIBNAME = deblock
 
 include ../../cxx.inc
 

plugins/delogo/Makefile

@@ -1,5 +1,5 @@
 
-LIB = liblogo.so
+LIBNAME = logo
 
 include ../../cxx.inc
 

plugins/dfttest/Makefile

@@ -1,7 +1,7 @@
 include ../../config.mak
 
 ifeq ($(HAVE_FFTW3F),yes)
-LIB = libdfttest.so
+LIBNAME = dfttest
 LIBADD = -lfftw3f
 local_CXXFLAGS = -Wno-parentheses
 endif

plugins/eedi2/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libeedi2.so
+LIBNAME = eedi2
 local_CXXFLAGS = -Wno-parentheses
 
 include ../../cxx.inc

plugins/ffms2/Makefile

@@ -15,7 +15,7 @@ endif #AVCODEC
 
 ifeq ($(FFMS2),yes)
 
-LIB = libffms2.so
+LIBNAME = ffms2
 local_CXXFLAGS = \
 	-Isrc/include \
 	-Isrc/src/config \

plugins/fft3dfilter/Makefile

@@ -1,7 +1,7 @@
 include ../../config.mak
 
 ifeq ($(HAVE_FFTW3F),yes)
-LIB = libfft3dfilter.so
+LIBNAME = fft3dfilter
 LIBADD = -lfftw3f_threads -lfftw3f
 endif
 

plugins/fieldhint/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libfieldhint.so
+LIBNAME = fieldhint
 
 include ../../cc.inc
 

plugins/fillborders/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libfillborders.so
+LIBNAME = fillborders
 
 include ../../cc.inc
 

plugins/flash3kyuu_deband/Makefile

@@ -1,7 +1,7 @@
 include ../../config.mak
 
 ifeq ($(HAVE_X86_64),yes)
-LIB = libf3kdb.so
+LIBNAME = f3kdb
 local_CXXFLAGS = -Isrc/include -DHAVE_ALIGNAS=1
 endif
 

plugins/fluxsmooth/Makefile

@@ -1,6 +1,6 @@
 include ../../config.mak
 
-LIB = libfluxsmooth.so
+LIBNAME = fluxsmooth
 
 ifeq ($(HAVE_X86_64),yes)
 ifeq ($(HAVE_YASM),yes)

plugins/fmtconv/Makefile

@@ -1,6 +1,6 @@
 include ../../config.mak
 
-LIB = libfmtconv.so
+LIBNAME = fmtconv
 
 ifeq ($(HAVE_X86_64),yes)
 local_CXXFLAGS = -mcx16

plugins/genericfilters/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libgenericfilters.so
+LIBNAME = genericfilters
 
 local_CFLAGS = -Wno-unused-function -DUSE_X86_INTRINSICS \
 	-Isrc/alone -Isrc/common -Isrc/convolution -Isrc/neighbors -Isrc/specific

plugins/histogram/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libhistogram.so
+LIBNAME = histogram
 LIBADD = -lm
 
 include ../../cc.inc

plugins/imagereader/Makefile

@@ -16,22 +16,25 @@ endif #HAVE_NASM
 ifeq ($(V), 1)
 MAKE = make V=1
 AUTORECONF = autoreconf -iv
+SILENTRULES = --disable-silent-rules
 else
 MAKE = make V=0
 AUTORECONF = autoreconf -i
+SILENTRULES = --enable-silent-rules
 endif
 
 turbodir = libjpeg-turbo
 ifeq ($(IMAGEREADER),yes)
-LIB = libimagereader.so
+LIBNAME = imagereader
+LIB = $(LIBNAME).so
 endif
 
 
 all: $(LIB)
 
 ifeq ($(IMAGEREADER),yes)
 
-libimagereader.so: $(turbodir)/libturbojpeg.la
+$(LIB): $(turbodir)/libturbojpeg.la
 	$(MAKE) -f imagereader.mk
 
 $(turbodir)/libturbojpeg.la: $(turbodir)/libjpeg.la
@@ -46,7 +49,7 @@ $(turbodir)/simd/libsimd.la: $(turbodir)/Makefile
 $(turbodir)/Makefile: $(turbodir)/configure
 	cd $(turbodir) && \
 	CFLAGS="$(CFLAGS) -Wno-attributes -Wno-unused-but-set-variable" CPPFLAGS="$(CPPFLAGS)" \
-	./configure --build=$(BUILD) --host=$(HOST) --disable-silent-rules \
+	./configure --build=$(BUILD) --host=$(HOST) $(SILENTRULES) \
 		--enable-static --disable-shared --with-pic --with-jpeg8
 
 $(turbodir)/configure:

plugins/imagereader/imagereader.mk

@@ -1,5 +1,5 @@
 
-LIB = libimagereader.so
+LIBNAME = imagereader
 local_CFLAGS = -Wno-sign-compare -I./libjpeg-turbo
 LIBADD = libjpeg-turbo/.libs/libturbojpeg.a -ljpeg -lpng -lz
 

plugins/it/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libit.so
+LIBNAME = it
 
 local_CXXFLAGS = -D__SSE -mssse3
 

plugins/knlmeanscl/Makefile

@@ -1,7 +1,7 @@
 include ../../config.mak
 
 ifeq ($(HAVE_OPENCL),yes)
-LIB = libknlmeanscl.so
+LIBNAME = knlmeanscl
 
 local_CXXFLAGS = $(CL_CFLAGS)
 LIBADD = $(CL_LIBS)

plugins/lsmashsource/Makefile

@@ -17,12 +17,13 @@ verbose = V=0
 ffverbose = 
 endif
 
-LIB = liblsmashsource.so
+LIBNAME = lsmashsource
+LIB = $(LIBNAME).so
 
 
 all: $(LIB)
 
-liblsmashsource.so: libs/lib/lsmash_stamp libs/lib/ffmpeg_stamp
+$(LIB): libs/lib/lsmash_stamp libs/lib/ffmpeg_stamp
 	$(MAKE) -f lsmashsource.mk $(verbose)
 
 libs/lib/lsmash_stamp: lsmash/config.mak

plugins/lsmashsource/lsmash/Makefile

@@ -3,6 +3,13 @@
 # note:
 # Currently, this Makefile is not tested except GNU make.
 
+ifneq ($(V),1)
+CCLD_silent   = @ echo '  CCLD     '$@;
+CC_silent     = @ echo '  CC       '$@;
+AR_silent     = @ echo '  AR       '$@;
+RANLIB_silent = @ echo '  RANLIB   '$@;
+endif
+
 include config.mak
 
 vpath %.c $(SRCDIR)
@@ -21,12 +28,12 @@ all: $(STATICLIB) $(SHAREDLIB) $(TOOLS)
 lib: $(STATICLIB) $(SHAREDLIB)
 
 $(STATICLIBNAME): $(OBJS)
-	$(AR) rc $@ $^
-	$(RANLIB) $@
+	$(AR_silent)$(AR) rc $@ $^
+	$(RANLIB_silent)$(RANLIB) $@
 	-@ $(if $(STRIP), $(STRIP) -x $@)
 
 $(SHAREDLIBNAME): $(OBJS)
-	$(LD) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(CCLD_silent)$(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 	-@ $(if $(STRIP), $(STRIP) -x $@)
 ifeq ($(SHAREDLIBNAME), liblsmash.so.$(MAJVER))
 	ln -sf $(SHAREDLIBNAME) liblsmash.so
@@ -37,7 +44,7 @@ endif
 include config.mak2
 
 %.o: %.c .depend config.h
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC_silent)$(CC) -c $(CFLAGS) -o $@ $<
 
 install: all install-lib
 	install -d $(DESTDIR)$(bindir)

plugins/lsmashsource/lsmash/configure

@@ -393,7 +393,7 @@ Cflags: -I${includedir}
 EOF
 
 
-cat >> config.mak << EOF
+cat > config.mak << EOF
 SRCDIR = $SRCDIR
 DESTDIR = $DESTDIR
 prefix = $prefix
@@ -427,11 +427,17 @@ TOOLS = $TOOLS_NAME
 MAJVER = $MAJVER
 EOF
 
+cat > config.mak2 << EOF
+ifneq (\$(V),1)
+CCLD_silent   = @ echo '  CCLD     '\$@;
+endif
+
+EOF
 
 for tool in $TOOLS; do
     cat >> config.mak2 << EOF
 cli/${tool}${EXT}: cli/${tool}.o $OBJ_TOOLS $STATICLIB $SHAREDLIB
-	\$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$< $OBJ_TOOLS -llsmash \$(LIBS)
+	\$(CCLD_silent)\$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$< $OBJ_TOOLS -llsmash \$(LIBS)
 	-@ \$(if \$(STRIP), \$(STRIP) \$@)
 
 EOF

plugins/lsmashsource/lsmashsource.mk

@@ -1,6 +1,6 @@
 include ../../config.mak
 
-LIB = liblsmashsource.so
+LIBNAME = lsmashsource
 
 local_CFLAGS = -std=c99 -I./libs/include -Wno-sign-compare -Wno-missing-field-initializers
 LIBADD = -L./libs/lib -llsmash -lavformat -lavcodec -lswscale -lavutil -lavresample -lpthread -lm

plugins/msmoosh/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libmsmoosh.so
+LIBNAME = msmoosh
 
 include ../../cxx.inc
 

plugins/mvtools/Makefile

@@ -3,7 +3,7 @@ include ../../config.mak
 ifeq ($(HAVE_YASM),yes)
 ifeq ($(HAVE_FFTW3F),yes)
 
-LIB = libmvtools.so
+LIBNAME = mvtools
 LIBADD = -lfftw3f
 
 VSASFLAGS = -Dprivate_prefix=mvtools -DHIGH_BIT_DEPTH=0 -DBIT_DEPTH=8 -f elf

plugins/nnedi3/Makefile

@@ -2,7 +2,7 @@ include ../../config.mak
 
 PACKAGE_VERSION = 7
 
-LIB = libnnedi3.so
+LIBNAME = nnedi3
 LIBADD = -lm
 local_CXXFLAGS = -Wno-unused-variable -DPACKAGE_VERSION='"$(PACKAGE_VERSION)"' -DNNEDI3_X86 -DNNEDI3_DATADIR='"$(datarootdir)/nnedi3"'
 

plugins/rawsource/Makefile

@@ -1,5 +1,5 @@
 
-LIB = librawsource.so
+LIBNAME = rawsource
 local_CFLAGS = -Wno-missing-field-initializers
 
 include ../../cc.inc

plugins/reduceflicker/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libreduceflicker.so
+LIBNAME = reduceflicker
 
 include ../../config.mak
 

plugins/retinex/Makefile

@@ -1,4 +1,4 @@
 
-LIB = libretinex.so
+LIBNAME = retinex
 
 include ../../cxx.inc

plugins/sangnommod/Makefile

@@ -1,5 +1,5 @@
 
-LIB = libsangnommod.so
+LIBNAME = sangnommod
 
 include ../../cxx.inc