ICU-491.11.3.tar.gz

[apple/icu.git] / icuSources / icudefs.mk.in

diff --git a/icuSources/icudefs.mk.in b/icuSources/icudefs.mk.in
index a6923e32fac3eb1be38ecd4a4a9eca758ac53f66..699031ecfd193a566259173be09f211156fb3964 100644 (file)
--- a/icuSources/icudefs.mk.in
+++ b/icuSources/icudefs.mk.in
@@ -2,7 +2,7 @@
 #
 # Yves Arrouye.
 #
-# Copyright (C) 2000-2010, International Business Machines Corporation and others.
+# Copyright (C) 2000-2012, International Business Machines Corporation and others.
 # All Rights Reserved.
 
 #
@@ -124,7 +124,8 @@ UCLN_NO_AUTO_CLEANUP = @UCLN_NO_AUTO_CLEANUP@
 # DEFS is for common macro definitions.
 # configure prevents user defined DEFS, and configure's DEFS is not needed
 # So we ignore the DEFS that comes from configure
-DEFS =
+# U_ATTRIBUTE_DEPRECATED is defined to hide warnings about deprecated API warnings.
+DEFS = -DU_ATTRIBUTE_DEPRECATED=
 # CFLAGS is for C only flags
 CFLAGS = @CFLAGS@
 # CXXFLAGS is for C++ only flags
@@ -220,11 +221,6 @@ BINDIR=$(top_builddir)/bin
 TOOLBINDIR=$(BINDIR)
 TOOLLIBDIR=$(LIBDIR)
 
-# Current full path directory.
-CURR_FULL_DIR=$(shell pwd | sed 's/ /\\ /g')
-# Current full path directory for use in source code in a -D compiler option.
-CURR_SRCCODE_FULL_DIR=$(shell pwd | sed 's/ /\\ /')
-
 # Name flexibility for the library naming scheme.  Any modifications should
 # be made in the mh- file for the specific platform.
 DATA_STUBNAME = data
@@ -264,10 +260,16 @@ LIBICUIO  = $(LLIBDIR) $(ICULIBS_IO)
 INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)$(LIBDIR):$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
 # prefer stubdata
 PKGDATA_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$(LIBRARY_PATH_PREFIX)$(LIBDIR):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER) $(PKGDATA_INVOKE_OPTS)
+INSTALLED_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR)
 
 # Platform-specific setup
 include @platform_make_fragment@
 
+# Current full path directory.
+CURR_FULL_DIR=$(shell pwd | sed 's/ /\\ /g')
+# Current full path directory for use in source code in a -D compiler option.
+CURR_SRCCODE_FULL_DIR=$(shell pwd | sed 's/ /\\ /')
+
 # When shared libraries are disabled and static libraries are enabled,
 # the C++ compiler must be used to link in the libraries for the tools.
 ifneq ($(ENABLE_SHARED),YES)