X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/729e4ab9bc6618bc3d8a898e575df7f4019e29ca..HEAD:/icuSources/tools/genren/Makefile?ds=inline

diff --git a/icuSources/tools/genren/Makefile b/icuSources/tools/genren/Makefile
index a2c33182..082c74fa 100644
--- a/icuSources/tools/genren/Makefile
+++ b/icuSources/tools/genren/Makefile
@@ -1,34 +1,47 @@
+# Copyright (C) 2016 and later: Unicode, Inc. and others.
+# License & terms of use: http://www.unicode.org/copyright.html
 #******************************************************************************
 #
-#   Copyright (C) 2002-2009, International Business Machines
+#   Copyright (C) 2002-2011, International Business Machines
 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************
 
 TOP=../..
+
 srcdir = .
 top_srcdir = $(TOP)
-
 top_builddir = $(TOP)
 
-include $(TOP)/icudefs.mk
+# override if you have an out-of-source build (not yet working.)
+BUILDDIR = $(top_builddir)
+
 ICUDIR=ICUunrenamed
-#SO=so
+
+# Extra flags to prevent internal API from being hidden.
+# This is important because ELF (Linux) based platforms that don't hide internal
+# API will allow a duplicate internal name to resolve to an external library.
+# See the gcc manual on the "visibility" attribute for details.
+FLAG_OVERRIDE= LIBCFLAGS= LIBCXXFLAGS= $(EXTRA_MAKE_OPTIONS)
+
+## any local overrides
+-include Makefile.local
+
+#  load definition of .SO, etc (but not if we are doing 'make clean')
+ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
+include $(BUILDDIR)/icudefs.mk
+endif
 
 COM=$(ICUDIR)/lib/libicuuc.$(SO)
 I18=$(ICUDIR)/lib/libicui18n.$(SO)
-LAY=$(ICUDIR)/lib/libicule.$(SO)
 LEX=$(ICUDIR)/lib/libiculx.$(SO)
 DAT=$(ICUDIR)/stubdata/libicudata.$(SO)
 UIO=$(ICUDIR)/lib/libicuio.$(SO)
 
-LIBS=$(COM) $(I18) $(LAY) $(LEX) $(UIO)
+LIBS=$(COM) $(I18) $(LEX) $(UIO)
+
+## Targets.
 
-# Extra flags to prevent internal API from being hidden.
-# This is important because ELF (Linux) based platforms that don't hide internal
-# API will allow a duplicate internal name to resolve to an external library.
-# See the gcc manual on the "visibility" attribute for details.
-FLAG_OVERRIDE= LIBCFLAGS= LIBCXXFLAGS= $(EXTRA_MAKE_OPTIONS)
 
 all:
 	@cat README
@@ -42,7 +55,7 @@ $(ICUDIR)/config.status:
 	-mv $(ICUDIR) $(ICUDIR)old
 	-(rm -rf $(ICUDIR)old &)
 	mkdir $(ICUDIR)
-	( cd $(ICUDIR) ; CPPFLAGS=-DURENAME_H $(TOP)/../configure --with-data-packaging=archive --enable-tests=no --prefix=`pwd` $(GENREN_CONFIGURE_OPTS) )
+	( cd $(ICUDIR) ; CPPFLAGS="-DU_DISABLE_RENAMING=1 -DUCONFIG_ENABLE_PLUGINS" $(GENREN_CONFIGURE_ENV) $(top_srcdir)/../configure --with-data-packaging=archive --enable-tests=no --prefix=`pwd` $(GENREN_CONFIGURE_OPTS) )
     # cause lib and bin to be created, and any other general sanity
 	$(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR) clean
 	$(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR) all-local
@@ -57,9 +70,6 @@ $(COM): $(DAT) $(ICUDIR)/config.status Makefile
 $(I18): $(DAT) $(COM) $(ICUDIR)/config.status Makefile
 	$(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR)/i18n all-local
 
-$(LAY): $(DAT) $(I18) $(COM) $(ICUDIR)/config.status Makefile
-	$(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR)/layout all-local
-
 $(LEX): $(DAT) $(I18) $(COM) $(ICUDIR)/config.status Makefile
 	$(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR)/layoutex all-local
 
@@ -71,6 +81,7 @@ urename.h: $(LIBS) genren.pl
 	-cp urename.h urename.h.old
 	perl ./genren.pl $(GENREN_PL_OPTS) $(LIBS)
 
+# This is still here, but less useful with the "new" macro-based rename. Just use 'svn diff'.
 sorts:	urename.sort urename.old.sort
 	@echo "*** Please check urename.h manually before committing it."
 	@echo "Try 'diff --side-by-side urename.old.sort urename.sort'"
@@ -78,12 +89,10 @@ sorts:	urename.sort urename.old.sort
 urename.sort: urename.h
 	sort urename.h > $@
 
-urename.old.sort: $(TOP)/common/unicode/urename.h
-	sort  $(TOP)/common/unicode/urename.h > $@
-
-install-header: urename.h sorts
-	cp $(TOP)/common/unicode/urename.h $(TOP)/common/unicode/urename.h.old
-	cp urename.h $(TOP)/common/unicode/
+urename.old.sort: $(top_srcdir)/common/unicode/urename.h
+	sort  $(top_srcdir)/common/unicode/urename.h > $@
 
--include Makefile.local
+install-header: urename.h
+	cp urename.h $(top_srcdir)/common/unicode/
+	@echo "*** Please check urename.h manually before committing it."