[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/platform/winmingw.mk |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 4432625b90bfd8b831e8a01bc5c380a1bf15fbc7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 23 01:28:12 2011 +0300

    gb_MINGWLIBDIR is not used anywhere

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 17e65a7..5ebed04 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -44,15 +44,6 @@ gb_AWK := awk
 gb_CLASSPATHSEP := :
 gb_YACC := bison
 gb_RC := $(WINDRES)
-ifeq ($(USE_MINGW),cygwin)
-gb_MINGWLIBDIR := $(COMPATH)/lib/mingw
-else
-ifeq ($(USE_MINGW),cygwin-w64-mingw32)
-gb_MINGWLIBDIR := $(COMPATH)/usr/i686-w64-mingw32/sys-root/mingw/lib
-else
-gb_MINGWLIBDIR := $(COMPATH)/lib
-endif
-endif
 ifeq ($(MINGW_SHARED_GXXLIB),YES)
 gb_MINGW_LIBSTDCPP := $(subst -l,,$(MINGW_SHARED_LIBSTDCPP))
 else
commit 457535e1bb5c9ab6a6726e0c814c8df60f1d4e6d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 23 01:20:33 2011 +0300

    Add YaccObject class

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index d4af631..17e65a7 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -42,6 +42,7 @@ gb_CXX := $(CXX)
 gb_AR := $(shell $(CC) -print-prog-name=ar)
 gb_AWK := awk
 gb_CLASSPATHSEP := :
+gb_YACC := bison
 gb_RC := $(WINDRES)
 ifeq ($(USE_MINGW),cygwin)
 gb_MINGWLIBDIR := $(COMPATH)/lib/mingw
@@ -222,6 +223,16 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
 $(1)))))
 endef
 
+# YaccObject class
+
+define gb_YaccObject__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(3)) && \
+	$(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+
+endef
+
 # CObject class
 
 # We (LibreOffice) support MinGW only for cross-compilation. This is identical to