X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/46f4442e9a5a4f3b98b7c1083586332f6a8a99a4..5ea0322b6ab2af986e4c764284141380031dd014:/icuSources/tools/genrb/Makefile.in?ds=sidebyside

diff --git a/icuSources/tools/genrb/Makefile.in b/icuSources/tools/genrb/Makefile.in
index 4c83e907..8615199b 100644
--- a/icuSources/tools/genrb/Makefile.in
+++ b/icuSources/tools/genrb/Makefile.in
@@ -1,29 +1,8 @@
-## Makefile.in for ICU - tools/genrb
-## Copyright (c) 1999-2008, International Business Machines Corporation and
-## others. All Rights Reserved.
-
-# SIMPLIFIED WAY TO BUILD ICU4J DATA FROM C
-#
-# Note: do NOT edit this file, Makefile or Makefile.in
-# Create a new file, Makefile.local
-#
-# 1. Need to set the following variable in Makefile.local:
-#
-#   ICU4J_HOME      example:  ICU4J_HOME=/home/srl/icu4j
-#        Path to your icu4j directory. Should contain build.xml
-#        If not set, will create a 'icu4j' directory in source/tools/genrb/icu4j
-#
-# 2.  The next variable can be set by uncommenting and copying the following line to your Makefile.local.GENDTJAR_JARHOME 
-#
-## GENDTJAR_JARHOME:=$(shell dirname `which jar`)
-## (uncomment the above line and copy to Makefile.local)
-#
-# GENDTJAR_JARHOME is the directory containing the 'jar' binary, such as /usr/bin
-#
-#
-# 3. Now, you can run 'make build-icu4j'  from icu/source/data  (convenience) 
-#        or icu/source/tools/genrb (this directory)
-
+#################################################################################
+## Makefile.in for ICU - tools/genrb                                            #
+## Copyright (c) 1999-2014, International Business Machines Corporation and     #
+## others. All Rights Reserved.                                                 #
+#################################################################################
 
 ## Source directory information
 srcdir = @srcdir@
@@ -41,21 +20,20 @@ DERB_STUB_NAME = derb
 
 SECTION = 1
 
-MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) $(DERB_STUB_NAME).$(SECTION)
-
+MAN_FILES = $(TARGET_STUB_NAME).$(SECTION)
+@ICUIO_TRUE@MAN_FILES += $(DERB_STUB_NAME).$(SECTION)
 
 ## Extra files to remove for 'make clean'
 CLEANFILES = *~ $(MAN_FILES) $(DEPS) $(DERB_DEPS)
 
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
-DERB = $(BINDIR)/$(DERB_STUB_NAME)$(EXEEXT)
+# derb depends on icuio
+@ICUIO_TRUE@DERB = $(BINDIR)/$(DERB_STUB_NAME)$(EXEEXT)
 
-ifneq ($(top_builddir),$(top_srcdir))
-CPPFLAGS += -I$(top_builddir)/common
-endif
-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
-LIBS = $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
+CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil -I$(top_srcdir)/io
+CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit
+LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o rbutil.o \
 wrtjava.o rle.o wrtxml.o prscmnts.o
@@ -64,23 +42,11 @@ DERB_OBJ = derb.o
 DEPS = $(OBJECTS:.o=.d)
 DERB_DEPS = $(DERB_OBJ:.o=.d)
 
-# build-icu4j  variables
-GENDTJAR_ICUHOME=$(shell pwd)/../../..
-GENDTJAR_OPTS=--icu-root="$(GENDTJAR_ICUHOME)" --jar="$(GENDTJAR_JARHOME)" --icu4j-root="$(ICU4J_HOME)" --verbose
-GENDTJAR_TEMP=./temp/
-GENDTJAR=$(srcdir)/gendtjar.pl
-
 -include Makefile.local
 
-ifeq (,$(ICU4J_HOME))
-ICU4J_HOME=$(shell pwd)/icu4j
-endif
-
-
 ## List of phony targets
 .PHONY : all all-local install install-local clean clean-local	\
-distclean distclean-local dist dist-local check check-local install-man \
-build-icu4j
+distclean distclean-local dist dist-local check check-local install-man
 
 ## Clear suffix list
 .SUFFIXES :
@@ -93,12 +59,12 @@ distclean : distclean-local
 dist: dist-local
 check: all check-local
 
-all-local: $(TARGET) $(DERB) $(MAN_FILES) 
+all-local: $(TARGET) $(DERB) $(MAN_FILES)
 
 install-local: all-local install-man
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
-	$(INSTALL) $(DERB) $(DESTDIR)$(bindir)
+@ICUIO_TRUE@	$(INSTALL) $(DERB) $(DESTDIR)$(bindir)
 
 install-man: $(MAN_FILES)
 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
@@ -108,7 +74,7 @@ dist-local:
 
 clean-local:
 	test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
-	$(RMV) $(TARGET) $(DERB) $(OBJECTS) $(DERB_OBJ) $(GENDTJAR_TEMP)
+	$(RMV) $(TARGET) $(DERB) $(OBJECTS) $(DERB_OBJ)
 
 distclean-local: clean-local
 	$(RMV) Makefile
@@ -120,27 +86,13 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(TARGET) : $(OBJECTS)
-	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) 
+	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
 	$(POST_BUILD_STEP)
 
 $(DERB) : $(DERB_OBJ)
-	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBICUIO) $(LIBS)
 	$(POST_BUILD_STEP)
 
-$(GENDTJAR_JARHOME)/jar:
-	@echo $@ not found - make sure GENDTJAR_JARHOME is set. See Makefile.in
-	exit 1
-
-$(ICU4J_HOME)/build.xml:
-	@echo warning: $@ not found - make sure ICU4J_HOME is set.
-
-build-icu4j:	$(GENDTJAR) $(ICU4J_HOME)/build.xml $(GENDTJAR_JARHOME)/jar
-	# clean up old temp files
-	-$(RMV) $(GENDTJAR_TEMP)
-	perl $(GENDTJAR) $(GENDTJAR_OPTS)
-	@echo Finished building to $(ICU4J_HOME)
-
-
 # This line is needed to serialize builds when the gmake -j option is used.
 $(TARGET_STUB_NAME).$(SECTION): $(DERB_STUB_NAME).$(SECTION)
 
@@ -157,4 +109,3 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
 -include $(DEPS)
 endif
 endif
-