From 408c5595e34788cbe1e4701c594acd13e77cc4a0 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 16 Sep 2009 14:49:32 +0000 Subject: CWS-TOOLING: integrate CWS cloph13 2009-09-01 #i104566# also use syslibroot/isysroot for external components 2009-08-28 #i104568# clean up duplicated definitions of OBJCXXFLAGS 2009-08-28 #i104567# add ccache-detection to configure (to skip to objcxx-flags) 2009-08-28 #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches ignore "-isysroot /Developer/..." arguments for OOo's cpp --- apple_remote/makefile.mk | 1 - apple_remote/makefile2.pmk | 35 ----------------------------------- hyphen/makefile.mk | 4 +++- libtextcat/makefile.mk | 2 +- libxmlsec/makefile.mk | 4 +++- lpsolve/makefile.mk | 1 + redland/raptor/makefile.mk | 2 +- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- 9 files changed, 11 insertions(+), 42 deletions(-) delete mode 100644 apple_remote/makefile2.pmk diff --git a/apple_remote/makefile.mk b/apple_remote/makefile.mk index b0da5011656b..4abde8bf709b 100644 --- a/apple_remote/makefile.mk +++ b/apple_remote/makefile.mk @@ -39,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/makefile2.pmk # --- Files -------------------------------------------------------- diff --git a/apple_remote/makefile2.pmk b/apple_remote/makefile2.pmk deleted file mode 100644 index cc06558f7594..000000000000 --- a/apple_remote/makefile2.pmk +++ /dev/null @@ -1,35 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile2.pmk,v $ -# -# $Revision: 1.1 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(GUIBASE)"=="aqua" -OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions -CFLAGSCXX+=$(OBJCXXFLAGS) -.ENDIF # "$(GUIBASE)"=="aqua" diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index 6ba6f1064c5a..ab1c4d7dfffa 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -63,7 +63,9 @@ LCL_CONFIGURE_CFLAGS+=-m64 LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS) CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)" .ENDIF # "$(EXTRA_CFLAGS)"!="" -.ENDIF # "$(SYSBASE)"!="" +.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +.ENDIF .IF "$(LCL_CONFIGURE_CFLAGS)"!="" CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)' diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index 33c76042be97..c7d66e58cb62 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -58,7 +58,7 @@ ADDITIONAL_FILES= \ #relative to CONFIGURE_DIR CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" -CONFIGURE_FLAGS= +CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) BUILD_ACTION=make diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 7632fc179414..c4815bc26ed9 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -120,7 +120,9 @@ xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS) xmlsec_CFLAGS+=$(EXTRA_CFLAGS) .ENDIF # "$(EXTRA_CFLAGS)"!="" xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib -.ENDIF # "$(SYSBASE)"!="" +.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" +xmlsec_CPPFLAGS+=$(EXTRA_CDEFS) +.ENDIF .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 8401f8092dcf..d8663f7c905f 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -73,6 +73,7 @@ BUILD_ACTION=sh ccc.os2 OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib .ELSE .IF "$(OS)"=="MACOSX" +.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS BUILD_ACTION=sh ccc.osx OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib .ELSE diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 432bc7193986..2dd5dfe69905 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -118,7 +118,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" -CPPFLAGS+:=$(EXTRA_CFLAGS) +CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 21b919c5186a..c7ae0ed07df4 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -115,7 +115,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" -CPPFLAGS+:=$(EXTRA_CFLAGS) +CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 26dc546f7238..bb9fe2033ad2 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -121,7 +121,7 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib .ENDIF -CPPFLAGS+:=$(EXTRA_CFLAGS) +CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config -- cgit