[Libreoffice-commits] .: 2 commits - icu/makefile.mk libxml2/makefile.mk

[Caolán McNamara]

 icu/makefile.mk     |    2 +-
 libxml2/makefile.mk |   13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 0ffc8c0d70860e1da3b71eb3ffbb30a0d463ddef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 10 13:13:59 2012 +0000

    build debugging libxml2 with -g

diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 1d125c1..78c4c3e 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -106,10 +106,19 @@ BUILD_ACTION=nmake
 BUILD_DIR=$(CONFIGURE_DIR)
 .ENDIF
 .ELSE
+
+.IF "$(debug)" != ""
+xml2_CFLAGS+=-g
+.ELSE
+xml2_CFLAGS+=-O
+.ENDIF
+
+xml2_CFLAGS+=$(ARCH_FLAGS)
+
 .IF "$(SYSBASE)"!=""
 xml2_CFLAGS+=-I$(SYSBASE)$/usr$/include 
 .IF "$(COMNAME)"=="sunpro5"
-xml2_CFLAGS+=$(ARCH_FLAGS) $(C_RESTRICTIONFLAGS)
+xml2_CFLAGS+=$(C_RESTRICTIONFLAGS)
 .ENDIF			# "$(COMNAME)"=="sunpro5"
 xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
 .ENDIF			# "$(SYSBASE)"!=""
@@ -121,7 +130,7 @@ CONFIGURE_FLAGS=--disable-shared
 .ELSE
 CONFIGURE_FLAGS=--disable-static
 .ENDIF
-CONFIGURE_FLAGS+=--enable-ipv6=no --without-python --without-zlib --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
+CONFIGURE_FLAGS+=--enable-ipv6=no --without-python --without-zlib --with-sax1=yes CFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
commit 7c21df4eb3a977de368b40906b9808d078349f9e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 10 13:13:19 2012 +0000

    typo in .IF

diff --git a/icu/makefile.mk b/icu/makefile.mk
index cb02475..02f94a4 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -82,7 +82,7 @@ CC:=gcc $(EXTRA_CFLAGS)
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(OS)"=="MACOSX"
 
-.IF "$(debug) != ""
+.IF "$(debug)" != ""
 icu_CFLAGS+=-g $(ARCH_FLAGS)
 icu_CXXFLAGS+=-g $(ARCH_FLAGS)
 .ELSE