From 2396ef8c28cce2c71bac85c768f2cd3faf1305fc Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 12 Nov 2014 23:45:49 +0000 Subject: [PATCH] [misc] improve silent automake rules --- configure | 2 -- configure.ac | 5 +---- res/localization/Makefile.am | 9 +++++---- res/localization/Makefile.in | 9 +++++---- src/Makefile.am | 9 +++++---- src/Makefile.in | 9 +++++---- src/rufus.rc | 16 ++++++++-------- 7 files changed, 29 insertions(+), 30 deletions(-) diff --git a/configure b/configure index c523c876..49d98d49 100644 --- a/configure +++ b/configure @@ -2269,8 +2269,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -# Enable silent build rules by default (Automake v1.11 or later). -# Disable by either passing --disable-silent-rules to configure or passing V=1 to make # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; diff --git a/configure.ac b/configure.ac index 5a77c1b1..21226c91 100644 --- a/configure.ac +++ b/configure.ac @@ -2,10 +2,7 @@ AC_INIT([rufus], [1.5.0], [https://github.com/pbatard/rufus/issues], [rufus], [h AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) -# Enable silent build rules by default (Automake v1.11 or later). -# Disable by either passing --disable-silent-rules to configure or passing V=1 to make -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +AM_SILENT_RULES([yes]) AC_PREREQ([2.50]) AC_PROG_CC diff --git a/res/localization/Makefile.am b/res/localization/Makefile.am index b824d71c..b105f0eb 100644 --- a/res/localization/Makefile.am +++ b/res/localization/Makefile.am @@ -4,12 +4,13 @@ BUILT_SOURCES = embedded.loc noinst_PROGRAMS = noinst_EXES = -pkg_v_sed = $(pkg_v_sed_$(V)) -pkg_v_sed_ = $(pkg_v_sed_$(AM_DEFAULT_VERBOSITY)) -pkg_v_sed_0 = @echo " SED $<"; +AM_V_SED_0 = @echo " SED $<";$(SED) +AM_V_SED_1 = $(SED) +AM_V_SED_ = $(AM_V_SED_$(AM_DEFAULT_VERBOSITY)) +AM_V_SED = $(AM_V_SED_$(V)) embedded.loc: rufus.loc - $(pkg_v_sed)$(SED) -f embedded.sed $< > $@ + $(AM_V_SED) -f embedded.sed $< > $@ clean-local: -rm -rf embedded.loc diff --git a/res/localization/Makefile.in b/res/localization/Makefile.in index 0d88144a..e5339ba8 100644 --- a/res/localization/Makefile.in +++ b/res/localization/Makefile.in @@ -141,9 +141,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ BUILT_SOURCES = embedded.loc noinst_EXES = -pkg_v_sed = $(pkg_v_sed_$(V)) -pkg_v_sed_ = $(pkg_v_sed_$(AM_DEFAULT_VERBOSITY)) -pkg_v_sed_0 = @echo " SED $<"; +AM_V_SED_0 = @echo " SED $<";$(SED) +AM_V_SED_1 = $(SED) +AM_V_SED_ = $(AM_V_SED_$(AM_DEFAULT_VERBOSITY)) +AM_V_SED = $(AM_V_SED_$(V)) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -302,7 +303,7 @@ uninstall-am: all-local: embedded.loc embedded.loc: rufus.loc - $(pkg_v_sed)$(SED) -f embedded.sed $< > $@ + $(AM_V_SED) -f embedded.sed $< > $@ clean-local: -rm -rf embedded.loc diff --git a/src/Makefile.am b/src/Makefile.am index 39ff50c7..ec6f107c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,12 +2,13 @@ SUBDIRS = ms-sys syslinux/libfat syslinux/libinstaller libcdio/iso9660 libcdio/u noinst_PROGRAMS = rufus -pkg_v_rc = $(pkg_v_rc_$(V)) -pkg_v_rc_ = $(pkg_v_rc_$(AM_DEFAULT_VERBOSITY)) -pkg_v_rc_0 = @echo " RC $@"; +AM_V_WINDRES_0 = @echo " RC $@";$(WINDRES) +AM_V_WINDRES_1 = $(WINDRES) +AM_V_WINDRES_ = $(AM_V_WINDRES_$(AM_DEFAULT_VERBOSITY)) +AM_V_WINDRES = $(AM_V_WINDRES_$(V)) %_rc.o: %.rc ../res/localization/embedded.loc - $(pkg_v_rc)$(WINDRES) $(AM_RCFLAGS) -i $< -o $@ + $(AM_V_WINDRES) $(AM_RCFLAGS) -i $< -o $@ rufus_SOURCES = drive.c icon.c parser.c localization.c iso.c net.c dos.c dos_locale.c badblocks.c syslinux.c usb.c vhd.c format.c smart.c stdio.c stdfn.c stdlg.c rufus.c rufus_CFLAGS = -I./ms-sys/inc -I./syslinux/libfat -I./syslinux/libinstaller -I./libcdio $(AM_CFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index dda0c84a..e091192b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -184,9 +184,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ms-sys syslinux/libfat syslinux/libinstaller libcdio/iso9660 libcdio/udf libcdio/driver ../res/localization -pkg_v_rc = $(pkg_v_rc_$(V)) -pkg_v_rc_ = $(pkg_v_rc_$(AM_DEFAULT_VERBOSITY)) -pkg_v_rc_0 = @echo " RC $@"; +AM_V_WINDRES_0 = @echo " RC $@";$(WINDRES) +AM_V_WINDRES_1 = $(WINDRES) +AM_V_WINDRES_ = $(AM_V_WINDRES_$(AM_DEFAULT_VERBOSITY)) +AM_V_WINDRES = $(AM_V_WINDRES_$(V)) rufus_SOURCES = drive.c icon.c parser.c localization.c iso.c net.c dos.c dos_locale.c badblocks.c syslinux.c usb.c vhd.c format.c smart.c stdio.c stdfn.c stdlg.c rufus.c rufus_CFLAGS = -I./ms-sys/inc -I./syslinux/libfat -I./syslinux/libinstaller -I./libcdio $(AM_CFLAGS) rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows @@ -642,7 +643,7 @@ uninstall-am: %_rc.o: %.rc ../res/localization/embedded.loc - $(pkg_v_rc)$(WINDRES) $(AM_RCFLAGS) -i $< -o $@ + $(AM_V_WINDRES) $(AM_RCFLAGS) -i $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/rufus.rc b/src/rufus.rc index 8a01568f..f3a17d46 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.5.0.539" +CAPTION "Rufus 1.5.0.540" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 @@ -164,7 +164,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.5.0.539" +CAPTION "Rufus 1.5.0.540" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 @@ -297,7 +297,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.5.0.539" +CAPTION "Rufus 1.5.0.540" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 @@ -437,7 +437,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.5.0.539" +CAPTION "Rufus 1.5.0.540" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 @@ -699,8 +699,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,539 - PRODUCTVERSION 1,5,0,539 + FILEVERSION 1,5,0,540 + PRODUCTVERSION 1,5,0,540 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -717,13 +717,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.5.0.539" + VALUE "FileVersion", "1.5.0.540" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.5.0.539" + VALUE "ProductVersion", "1.5.0.540" END END BLOCK "VarFileInfo"