From fbec1b7ef126fff09708028c16af636ee4c97631 Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Tue, 23 Sep 2003 00:29:28 +0000
Subject: [PATCH] ICU-3258 CygWin/MSVC changes

X-SVN-Rev: 13168
---
 icu4c/source/config/mh-cygwin-msvc   |  5 ++++-
 icu4c/source/data/Makefile.in        | 11 ++++++++---
 icu4c/source/extra/uconv/Makefile.in | 15 ++++++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/icu4c/source/config/mh-cygwin-msvc b/icu4c/source/config/mh-cygwin-msvc
index 0fbdb2a440f..f1e1ce1ba28 100644
--- a/icu4c/source/config/mh-cygwin-msvc
+++ b/icu4c/source/config/mh-cygwin-msvc
@@ -3,7 +3,7 @@
 ## Copyright (c) 2001-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-cygwin-msvc,v 1.13 2003/09/15 22:31:59 grhoten-oss Exp $
+## $Id: mh-cygwin-msvc,v 1.14 2003/09/23 00:29:28 grhoten-oss Exp $
 
 ## Commands to generate dependency files
 GEN_DEPS.c=	:
@@ -140,5 +140,8 @@ BIR_DEPS=
 # Environment variable to set a runtime search path
 LDLIBRARYPATH_ENVVAR = PATH
 
+PKGDATA_OPTS = -v
+PKGDATA_INVOKE_OPTS = MAKEFLAGS=
+
 ## End Cygwin-specific setup
 
diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in
index 4631a7bf0ad..93387a09475 100644
--- a/icu4c/source/data/Makefile.in
+++ b/icu4c/source/data/Makefile.in
@@ -22,9 +22,14 @@ LIB_ICUDATA_NAME=lib$(ICUDATA_NAME)
 # sanity!
 ICUDT=$(ICUDATA_PLATFORM_NAME)_
 
+# Allow Windows to override these options
+ifeq ($(PKGDATA_OPTS),)
+PKGDATA_OPTS = -O $(top_builddir)/data/icupkg.inc
+endif
+
 top_builddir_from_tmp = $(patsubst ..%,../..%,$(top_builddir))
 CURDIR=$(shell pwd)
-PKGDATA = $(top_builddir)/tools/pkgdata/pkgdata -O $(top_builddir)/data/icupkg.inc -c -d $(CURDIR)/out
+PKGDATA = $(top_builddir)/tools/pkgdata/pkgdata $(PKGDATA_OPTS) -c -d $(CURDIR)/out
 PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION)
 
 # OBJDATADIR must be a short path (with ..'s) to the data.
@@ -96,7 +101,7 @@ check-local:
 
 # During this INVOKE we only want to use stubdata.
 # We don't want to try to write over files that we are using.
-PKGDATA_INVOKE:=$(subst :$(top_builddir)/data/out,,$(INVOKE))
+PKGDATA_INVOKE:=$(subst :$(top_builddir)/data/out,,$(INVOKE)) $(PKGDATA_INVOKE_OPTS)
 
 packagedata: icupkg.inc $(BUILDDIR)/icudata.lst 
 	$(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(BUILDDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(BUILDDIR)/icudata.lst
@@ -394,6 +399,6 @@ $(TESTOUTDIR)/$(TESTDT)nam.typ: $(TESTBUILDDIR)/$(TESTDT)te_IN.res
 testdata: packagedata $(ALL_TEST_FILES) $(UNPACKAGEDTESTDATA)
 
 packagetest: testdata icupkg.inc $(TESTBUILDDIR)/testdata.lst 
-	$(INVOKE) $(PKGDATA) -T $(TESTBUILDDIR) -d $(TESTOUTDIR) -s $(TESTBUILDDIR) -p $(TESTDATA) -m common $(TESTBUILDDIR)/testdata.lst
+	$(PKGDATA_INVOKE) $(PKGDATA) -T $(TESTBUILDDIR) -d $(TESTOUTDIR) -s $(TESTBUILDDIR) -p $(TESTDATA) -m common $(TESTBUILDDIR)/testdata.lst
 
 
diff --git a/icu4c/source/extra/uconv/Makefile.in b/icu4c/source/extra/uconv/Makefile.in
index b343410e9de..f26ef42575e 100644
--- a/icu4c/source/extra/uconv/Makefile.in
+++ b/icu4c/source/extra/uconv/Makefile.in
@@ -1,6 +1,6 @@
 ## ******************************************************************************
 ## *
-## *   Copyright (C) 1999-2000, International Business Machines
+## *   Copyright (C) 1999-2003, International Business Machines
 ## *   Corporation and others.  All Rights Reserved.
 ## *
 ## *******************************************************************************
@@ -43,6 +43,10 @@ TARGET = uconv
 CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
 LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
+ifeq ($(PKGDATA_OPTS),)
+PKGDATA_OPTS = -O $(top_builddir)/data/icupkg.inc
+endif
+
 ## generic settings for data - common.
 PKGMODE=common
 INSTALLTO=$(DESTDIR)$(ICUDATA_DIR)
@@ -117,7 +121,7 @@ pkgdata.inc: $(srcdir)/pkgdata.inc.in  $(top_builddir)/config.status
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(TARGET) : $(OBJECTS)  $(UCONVMSG_LIB)
-	$(LINK.cc) -o $@ $(OBJECTS) $(LIBS)
+	$(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS)
 
 resfiles: $(RESFILES) package-resfiles
 
@@ -127,7 +131,7 @@ endif
 
 
 package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc
-	$(INVOKE) $(top_builddir)/tools/pkgdata/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
+	$(INVOKE) $(PKGDATA_INVOKE_OPTS) $(top_builddir)/tools/pkgdata/pkgdata -p $(RESDIR) $(PKGDATA_OPTS) -m $(PKGMODE) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
 
 $(RESDIR)/$(RESDIR).lst: Makefile pkgdata.inc $(srcdir)/resfiles.mk
 	@$(MKINSTALLDIRS) $(RESDIR)
@@ -158,8 +162,5 @@ install-man: $(ALL_MAN_FILES)
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-# Don't do this.  This is a problem when changing platforms.
-#ifneq ($(MAKECMDGOALS),distclean)
-#-include $(DEPS)
-#endif
+