From df2f941cd153443a46121111e3f3e685f9125c49 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 14 May 2020 18:40:16 +0200 Subject: Beautify silent build output and make silent build the default - ie. set V=1 to get full output again. --- configure.ac | 2 ++ plugin/Makefile.am | 6 +++++- plugin/vst/Makefile.am | 33 ++++++++++++++++++--------------- plugingui/Makefile.am | 6 +++++- test/uitests/Makefile.am | 6 +++++- 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 1994149..123e884 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,8 @@ AC_CONFIG_HEADERS(config.h) AC_SYS_LARGEFILE +AM_SILENT_RULES([yes]) + need_jack=no dnl =========================== diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 764a694..91786c2 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -69,8 +69,12 @@ if ENABLE_PUGL_COCOA UITYPE=CocoaUI endif +ttlgen_verbose = $(ttlgen_verbose_@AM_V@) +ttlgen_verbose_ = $(ttlgen_verbose_@AM_DEFAULT_V@) +ttlgen_verbose_0 = @echo " TTLGEN "$@; + manifest.ttl : ttlgen drumgizmo.la - ./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE) + $(ttlgen_verbose)./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE) > /dev/null ####### diff --git a/plugin/vst/Makefile.am b/plugin/vst/Makefile.am index be45282..bbb615f 100644 --- a/plugin/vst/Makefile.am +++ b/plugin/vst/Makefile.am @@ -5,39 +5,44 @@ endif # We know there are warnings in the VSTSDK code, so don't consider them errors. CXXFLAGS:=$(filter-out -Werror -Wall ,$(CXXFLAGS)) +cp_verbose = $(cp_verbose_@AM_V@) +cp_verbose_ = $(cp_verbose_@AM_DEFAULT_V@) +cp_verbose_0 = @echo " CP "$@; + +mkdir_verbose = $(mkdir_verbose_@AM_V@) +mkdir_verbose_ = $(mkdir_verbose_@AM_DEFAULT_V@) +mkdir_verbose_0 = @echo " MKDIR "$@; + # Targets to copy vst source files pluginterfaces/vst2.x: - $(MKDIR_P) pluginterfaces/vst2.x + $(mkdir_verbose)$(MKDIR_P) pluginterfaces/vst2.x pluginterfaces/vst2.x/aeffect.h: pluginterfaces/vst2.x @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffect.h - cp @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffect.h $@ + $(cp_verbose)cp @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffect.h $@ pluginterfaces/vst2.x/aeffectx.h: pluginterfaces/vst2.x @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffectx.h - cp @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffectx.h $@ - -#pluginterfaces/vst2.x/vstfxstore.h: pluginterfaces/vst2.x @VST_SOURCE_PATH@/pluginterfaces/vst2.x/vstfxstore.h -# cp @VST_SOURCE_PATH@/pluginterfaces/vst2.x/vstfxstore.h $@ + $(cp_verbose)cp @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffectx.h $@ public.sdk/source/vst2.x: - $(MKDIR_P) public.sdk/source/vst2.x + $(mkdir_verbose)$(MKDIR_P) public.sdk/source/vst2.x public.sdk/source/vst2.x/audioeffectx.h: public.sdk/source/vst2.x public.sdk/source/vst2.x/audioeffect.h pluginterfaces/vst2.x/aeffect.h @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.h - cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.h $@ + $(cp_verbose)cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.h $@ public.sdk/source/vst2.x/audioeffectx.cpp: public.sdk/source/vst2.x public.sdk/source/vst2.x/aeffeditor.h pluginterfaces/vst2.x/aeffectx.h public.sdk/source/vst2.x/audioeffectx.h @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.cpp - cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.cpp $@ + $(cp_verbose)cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.cpp $@ public.sdk/source/vst2.x/audioeffect.h: public.sdk/source/vst2.x @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.h - cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.h $@ + $(cp_verbose)cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.h $@ public.sdk/source/vst2.x/audioeffect.cpp: public.sdk/source/vst2.x public.sdk/source/vst2.x/audioeffect.h @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.cpp - cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.cpp $@ + $(cp_verbose)cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.cpp $@ public.sdk/source/vst2.x/aeffeditor.h: public.sdk/source/vst2.x @VST_SOURCE_PATH@/public.sdk/source/vst2.x/aeffeditor.h - cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/aeffeditor.h $@ + $(cp_verbose)cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/aeffeditor.h $@ public.sdk/source/vst2.x/vstplugmain.cpp: public.sdk/source/vst2.x @VST_SOURCE_PATH@/public.sdk/source/vst2.x/vstplugmain.cpp - cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/vstplugmain.cpp $@ + $(cp_verbose)cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/vstplugmain.cpp $@ # Hack to compile vst sources without -Wall -Werror libvstsdk_la_CXXFLAGS = -Wno-c++11-narrowing -w $(VST_CPPFLAGS) \ @@ -60,5 +65,3 @@ CLEANFILES = \ clean-local: -rm -rf public.sdk pluginterfaces - -#pluginterfaces/vst2.x/vstfxstore.h diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 219b450..f208f43 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -33,8 +33,12 @@ RES = \ ../BUGS \ ../COPYING +rcgen_verbose = $(rcgen_verbose_@AM_V@) +rcgen_verbose_ = $(rcgen_verbose_@AM_DEFAULT_V@) +rcgen_verbose_0 = @echo " RCGEN "$@; + resource_data.cc: rcgen $(RES) - ./rcgen -d $(top_srcdir)/plugingui $(RES) > $(top_srcdir)/plugingui/resource_data.cc + $(rcgen_verbose)./rcgen -d $(top_srcdir)/plugingui $(RES) > $(top_srcdir)/plugingui/resource_data.cc libdggui_la_CPPFLAGS = \ $(DEBUG_FLAGS) \ diff --git a/test/uitests/Makefile.am b/test/uitests/Makefile.am index 6a5894b..39571e2 100644 --- a/test/uitests/Makefile.am +++ b/test/uitests/Makefile.am @@ -51,8 +51,12 @@ RES = \ benchmarktest_resources/image_edge_alpha.png \ benchmarktest_resources/image_inner_alpha.png +rcgen_verbose = $(rcgen_verbose_@AM_V@) +rcgen_verbose_ = $(rcgen_verbose_@AM_DEFAULT_V@) +rcgen_verbose_0 = @echo " RCGEN "$@; + benchmarktest_resource_data.cc: $(top_builddir)/plugingui/rcgen $(RES) - $(top_builddir)/plugingui/rcgen -d $(top_srcdir)/test/uitests $(RES) > $(top_srcdir)/test/uitests/benchmarktest_resource_data.cc + $(rcgen_verbose)$(top_builddir)/plugingui/rcgen -d $(top_srcdir)/test/uitests $(RES) > $(top_srcdir)/test/uitests/benchmarktest_resource_data.cc benchmarktest_LDADD = \ $(top_builddir)/plugingui/libdggui.la \ -- cgit v1.2.3