[Ehs-devel] SF.net SVN: ehs:[156] trunk/conf

[<fe...@us...>]

Revision: 156
          http://ehs.svn.sourceforge.net/ehs/?rev=156&view=rev
Author:   felfert
Date:     2012-08-05 02:31:12 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
 - Make RPM builds verbosity configurable

Modified Paths:
--------------
    trunk/conf/ehs.spec.in
    trunk/conf/mingw32-ehs.spec.in

Modified: trunk/conf/ehs.spec.in
===================================================================
--- trunk/conf/ehs.spec.in	2012-06-12 15:04:07 UTC (rev 155)
+++ trunk/conf/ehs.spec.in	2012-08-05 02:31:12 UTC (rev 156)
@@ -5,6 +5,7 @@
 %define with_staticssl %{?_with_staticssl: 1} %{?!_with_staticssl: 0}
 # Enable debugging
 %define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
+%define make_verbose_flags %{?_with_verbose: V=1 AM_DEFAULT_VERBOSITY=1}
 
 %define rel @SVNREV@%{?dist}
 %define is_fc 0%{?fedora}%{?fedora_version}
@@ -61,6 +62,7 @@
 export CFLAGS="$RPM_OPT_FLAGS -DSPECIAL_STDERR"
 %endif
 %configure \
+    --enable-warn \
 %if %{with_debug}
     --enable-debug \
 %endif
@@ -68,10 +70,10 @@
      --enable-static --with-ssl=/opt/openssl-static
 %endif
 
-%{__make} %{?_smp_mflags} V=1
+%{__make} %{?_smp_mflags} %{make_verbose_flags}
 
 %install
-%{__make} DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} %{make_verbose_flags} install
 
 %clean
 %{__rm} -rf %{buildroot}

Modified: trunk/conf/mingw32-ehs.spec.in
===================================================================
--- trunk/conf/mingw32-ehs.spec.in	2012-06-12 15:04:07 UTC (rev 155)
+++ trunk/conf/mingw32-ehs.spec.in	2012-08-05 02:31:12 UTC (rev 156)
@@ -4,6 +4,7 @@
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
 %define __debug_install_post %{_mingw32_debug_install_post}
+%define make_verbose_flags %{?_with_verbose: V=1 AM_DEFAULT_VERBOSITY=1}
 
 %define rel @SVNREV@%{?dist}
 %define xname ehs
@@ -53,14 +54,14 @@
 %setup -q -n %{xname}-%{version}
 
 %build
-%{_mingw32_configure} --enable-static --enable-shared \
+%{_mingw32_configure} --enable-static --enable-shared --enable-warn \
     --with-dllpath=/usr/i686-pc-mingw32/sys-root/mingw/bin \
     --program-transform-name=s/i686-pc-mingw32-//
-make %{?_smp_mflags} V=1 AM_DEFAULT_VERBOSITY=1
+make %{?_smp_mflags} %{make_verbose_flags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT V=1 AM_DEFAULT_VERBOSITY=1 install
+make DESTDIR=$RPM_BUILD_ROOT %{make_verbose_flags} install
 
 %clean
 %{__rm} -rf %{buildroot}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.