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

[Tor Lillqvist]

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

New commits:
commit 8022eed1fa9581b267641b696c215fa7ed5beb1d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed May 18 22:47:51 2011 +0300

    Add libvisio

diff --git a/.gitignore b/.gitignore
index c17ae1f..e822eae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,6 +153,7 @@
 /languagetool
 /libegg
 /libtextcat
+/libvisio
 /libwpd
 /libwpg
 /libwps
commit e5912a8727e063f5f8e34c4116be5522d87dd3d3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed May 18 22:43:36 2011 +0300

    Use $(AR) instead of hardcoded ar

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index c73333f..7dd5c66 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -248,7 +248,7 @@ X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
 LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
 
 # name of library manager
-LIBMGR*=ar
+LIBMGR*=$(AR)
 LIBFLAGS=-r
 
 # tool for generating import libraries
commit 4fe7b5894097f2878cb0594825d88854d953da5b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed May 18 22:43:04 2011 +0300

    Include unxgcc and not unxlng, use unique DLLPOSTFIX

diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index c1929dc..25d1dba 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -25,10 +25,10 @@
 #
 #*************************************************************************
 
-# mk file for Android Linux ARM using GCC, please make generic modifications to unxlng.mk
+# mk file for Android Linux ARM using GCC, please make generic modifications to unxgcc.mk
 
 CDEFAULTOPT=-Os
-.INCLUDE : unxlng.mk
+.INCLUDE : unxgcc.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer
-DLLPOSTFIX=lr
+DLLPOSTFIX=ar