Author: arist
Date: Wed Nov 14 23:38:30 2012
New Revision: 1409561
URL: http://svn.apache.org/viewvc?rev=1409561&view=rev
Log:
gnumake4_076_ec87fcbfae8b.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1302711099 0
# Node ID ec87fcbfae8b1e7e7f69d7c7d08898b30b1fb6f3
# Parent 8720fd8b8b4406c30b10ba0b0267f11a4936e181
gnumake4: adapt makefiles
Modified:
incubator/ooo/branches/gbuild/main/RepositoryExternal.mk
incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk
Modified: incubator/ooo/branches/gbuild/main/RepositoryExternal.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryExternal.mk?rev=1409561&r1=1409560&r2=1409561&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryExternal.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryExternal.mk Wed Nov 14
23:38:30 2012
@@ -66,7 +66,7 @@ ifeq ($(SYSTEM_JPEG),YES)
define gb_LinkTarget__use_jpeg
$(call gb_LinkTarget_add_libs,$(1),-ljpeg)
$(call gb_LinkTarget_set_ldflags,$(1),\
- $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
+ $$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
)
endef
Modified: incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk?rev=1409561&r1=1409560&r2=1409561&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk (original)
+++ incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk Wed Nov 14
23:38:30 2012
@@ -93,11 +93,6 @@ $(eval $(call gb_Library_add_exception_o
framework/source/fwe/xml/xmlnamespaces \
))
-#todo: ImageListDescriptor can't be exported completely without exporting
everything
-# FIXME this should be fixed in m106 => remove this
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out
-fvisibility=hidden,$$(T_CXXFLAGS))))
-endif
ifeq ($(OS),FREEBSD)
$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out
-fvisibility=hidden,$$(CXXFLAGS))))
endif
