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

[Robert Nagy]

 solenv/gbuild/platform/openbsd.mk |   10 +++++----
 solenv/inc/unxobsd.mk             |   39 --------------------------------------
 2 files changed, 6 insertions(+), 43 deletions(-)

New commits:
commit f898f4dfb1e785dee1768e58c50b27f84d099e62
Merge: 90f42d0... 629bc90...
Author: Robert Nagy <robert at openbsd.org>
Date:   Tue Jul 26 23:34:03 2011 +0200

    Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap

commit 90f42d083580f1b245713a35d7e64a6243fe0271
Author: Robert Nagy <robert at openbsd.org>
Date:   Tue Jul 26 23:31:11 2011 +0200

    unbreak after the last gbuild merge

diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
index 4ccfa81..00f76e2 100644
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -45,16 +45,18 @@ gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS
 
 define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
+mkdir -p $(dir $(1)) && \
 	$(gb_CXX) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+		$(subst \d,$$,$(RPATH)) \
+		$(T_LDFLAGS) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
 		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
-		$(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
+		$(LIBS) \
+		$(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
 		-o $(1))
 endef
 
diff --git a/solenv/inc/unxobsd.mk b/solenv/inc/unxobsd.mk
index 85fe81a..fd4c744 100644
--- a/solenv/inc/unxobsd.mk
+++ b/solenv/inc/unxobsd.mk
@@ -27,44 +27,6 @@
 
 # Makefile for OpenBSD
 
-<<<<<<< HEAD
-$(eval $(call gb_Module_add_moduledirs,ooo,\
-	basebmp \
-	basegfx \
-    dbaccess \
-	canvas \
-    comphelper \
-	cppcanvas \
-        editeng \
-    framework \
-    idl \
-	linguistic \
-    oox \
-    padmin \
-	regexp \
-	reportdesign \
-	sax \
-    sfx2 \
-    sot \
-    starmath \
-    svl \
-    svtools \
-    svx \
-    sw \
-    toolkit \
-    tools \
-	ucbhelper \
-    unotools \
-    unoxml \
-    vbahelper \
-    wizards \
-    writerfilter \
-    vcl \
-    xmloff \
-	xmlreader \
-	xmlscript \
-))
-=======
 # arch specific defines
 .IF "$(CPUNAME)" == "INTEL"
 CDEFS+=-DX86
@@ -74,7 +36,6 @@ CDEFS+=-DX86_64
 ARCH_FLAGS*=
 BUILD64=1
 .ENDIF
->>>>>>> master
 
 .INCLUDE : unxgcc.mk