summaryrefslogtreecommitdiff
path: root/apple_remote
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-09-16 14:49:32 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-09-16 14:49:32 +0000
commit408c5595e34788cbe1e4701c594acd13e77cc4a0 (patch)
treea6184317ee3e3c720e3bade705e95ca779fa0b9a /apple_remote
parent8ffd74a9de667d83618ea15557bba480308e95e0 (diff)
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
Diffstat (limited to 'apple_remote')
-rw-r--r--apple_remote/makefile.mk1
-rw-r--r--apple_remote/makefile2.pmk35
2 files changed, 0 insertions, 36 deletions
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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(GUIBASE)"=="aqua"
-OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF # "$(GUIBASE)"=="aqua"