[Libreoffice-commits] .: 2 commits - .gitignore solenv/inc

[Caolán McNamara]

 .gitignore           |    6 ++++++
 solenv/inc/unxgcc.mk |    6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 5271b9c6ecb3efe521e30c872ddf4553a7d95984
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 10 20:37:58 2011 +0100

    reduce noise, split c/c++ warnings flags

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 2e6d66b..1446bf8 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -133,10 +133,10 @@ CFLAGSNOOPT=-O0
 CFLAGSOUTOBJ=-o
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
+CFLAGSWARNBOTH=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=$(CFLAGSWARNBOTH) -Wdeclaration-after-statement
+CFLAGSWARNCXX=$(CFLAGSWARNBOTH) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
-CFLAGSWARNCC+=-Wdeclaration-after-statement
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
 CFLAGSWERRCC=-Werror -DLIBO_WERROR
commit 5e0e2517f9dbbd65474baccfcbda263a2ee8b9bd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 10 20:27:08 2011 +0100

    ignore libxslt .memdump and LibO lock files

diff --git a/.gitignore b/.gitignore
index cd7b44d..b4fe3c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,9 @@ test/user-template/user/psprint/pspfontcache
 
 # MSVC debug information
 /*/vc90.pdb
+
+# libxslt debug memdump
+.memdump
+
+#LibreOffice lock files
+.~lock.*#