Tue, 6 Apr 2004 03:11:16 -0700

Update of /cvs/core/icu-sword/source/config
In directory www:/tmp/cvs-serv8911/source/config

Modified Files:
	Makefile.inc.in icu-config-bottom mh-aix mh-aix-va 
	mh-alpha-linux-cc mh-alpha-linux-gcc mh-alpha-osf mh-bsd-gcc 
	mh-cygwin mh-cygwin-msvc mh-darwin mh-hpux-acc mh-hpux-cc 
	mh-hpux-gcc mh-irix mh-linux mh-os390 mh-os400 mh-ptx mh-qnx 
	mh-solaris mh-solaris-gcc 
Added Files:
	mh-aix-gcc mh-beos mh-mpras 
Log Message:
ICU 2.8 sync

--- NEW FILE: mh-aix-gcc ---
## -*-makefile-*-
## Copyright (c) 2003 IBM, Ken Foskey, and others. All rights reserved.
##
## Aix-specific setup (for gcc)
##
## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability). 
## So, we are using 'windows' style library names, that is, libicuuc20.1.so instead of libicuuc.so.20.1

## Commands to generate dependency files
GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)

## Commands to link
## We need to use the C++ linker, even when linking C programs, since
##  our libraries contain C++ code (C++ static init not called)
LINK.c=		$(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) 
LINK.cc=	$(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) 

## Commands to make a shared library
SHLIB.c=    $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall
SHLIB.cc=   $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall
#SHLIB.c=	$(AIX_PREDELETE) $(AIX_SHLIB) -p 5000 $(LDFLAGS) -bexpall 
#SHLIB.cc=	$(AIX_PREDELETE) $(AIX_SHLIB) -p 5000 $(LDFLAGS) -bexpall 

## Compiler switch to embed a runtime search path
LD_RPATH=	-I
LD_RPATH_PRE=	

## enable the shared lib loader
LDFLAGS += -Wl,-bbigtoc

## We need to delete things prior to linking, or else we'll get
## SEVERE ERROR: output file in use ..  on AIX. 
## But, shell script version should NOT delete target as we don't
## have $@ in that context.  (SH = only shell script, icu-config)
AIX_PREDELETE=rm -f $@ ; 
#SH# AIX_PREDELETE=

## Environment variable to set a runtime search path
LDLIBRARYPATH_ENVVAR = LIBPATH

## Override Versioned target for a shared library.
FINAL_SO_TARGET=  $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)

# The following is for Makefile.inc's use.
ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)

# this one is for icudefs.mk's use
SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)

## Compiler switch to embed a library name. Not present on AIX.
LD_SONAME = 

## Shared object suffix
SO=	a
A=	a

## Non-shared intermediate object suffix
STATIC_O = o

## Special AIX rules

## Build archive from shared object
%.a : %.so
	$(AR) $(ARFLAGS) $@ $<

## Build import list from export list
%.e : %.exp
	@echo "Building an import list for $<"
	@$(SHELL) -ec "echo '#! $*.a($*.so)' | cat - $< > $@"

## Compilation rules
%.$(STATIC_O): $(srcdir)/%.c
	$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
%.o: $(srcdir)/%.c
	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<

%.$(STATIC_O): $(srcdir)/%.cpp
	$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
%.o: $(srcdir)/%.cpp
	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<


## Dependency rules
%.d: $(srcdir)/%.c
	@echo "generating dependency information for $<"
	@$(SHELL) -ec '$(GEN_DEPS.c) $< \
		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
		[ -s $@ ] || rm -f $@'

%.d: $(srcdir)/%.cpp
	@echo "generating dependency information for $<"
	@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
		[ -s $@ ] || rm -f $@'

## Versioned libraries rules
%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
%.$(SO): %$(SO_TARGET_VERSION).$(SO)
	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@


## BIR  - bind with internal references [so app data and icu data doesn't collide]
# LDflags that pkgdata will use
BIR_LDFLAGS= -Wl,-bE:$(NAME).map,-bnoexpall

# CPPflags for genccode/gencmn
BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES

# Dependencies [i.e. map files] for the final library
BIR_DEPS= $(NAME).map


--- NEW FILE: mh-beos ---
## -*-makefile-*-
## BeOS-specific setup
## Copyright (c) 2003-2003, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-beos,v 1.1 2004/04/06 10:08:09 chrislit Exp $
## Original author: Andrew Bachmann

## Commands to generate dependency files
GEN_DEPS.c=  $(CC) -E -MM $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)

# Safe optimizations
#OPTIMIZATIONS= -fdefault-inline -fdefer-pop -fforce-mem -fforce-addr \
#	  -finline -finline-functions \
#	  -fkeep-inline-functions -fkeep-static-consts -fbranch-count-reg \
#	  -ffunction-cse -fstrength-reduce -fthread-jumps -fcse-follow-jumps \
#	  -fcse-skip-blocks -frerun-cse-after-loop -frerun-loop-opt \
#	  -fexpensive-optimizations -foptimize-register-move -fregmove \
#	  -fschedule-insns -fschedule-insns2 -ffloat-store -funroll-loops \
#	  -fmove-all-movables -freduce-all-givs -fpeephole \
#	  -funroll-all-loops -ffunction-sections -fdata-sections

# BeOS gccs (geekgadgets + 2.95.3) have this old bug: 
# after this:          const wchar_t x[] = L"foo";
# x[2] is "optimized" into: (wchar_t)((char *)x)[2] (== 0)
#
# see also: http://gcc.gnu.org/ml/gcc-patches/2000-09/msg00454.html
#
# Unfortunately this behavior isn't controlled by a flag so we can't
# use any O optimizations at all. (the behavior kicks in at -O1)

# Optimizations aren't currently defined in the mh files.
# So Don't override any flags set by the user or runConfigureICU.
#CFLAGS += $(OPTIMIZATIONS)
#CXXFLAGS += $(OPTIMIZATIONS)

# Use -nostart instead of -shared
SHLIB.c=      $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -nostart
SHLIB.cc=     $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -nostart

## Flags for position independent code
SHAREDLIBCFLAGS = -fPIC
SHAREDLIBCXXFLAGS = -fPIC
SHAREDLIBCPPFLAGS = -DPIC

## Additional flags when building libraries and with threads
LIBCPPFLAGS = 
THREADSCPPFLAGS = 

## Compiler switch to embed a runtime search path
LD_RPATH=	
LD_RPATH_PRE = -Wl,-rpath,

## Compiler switch to embed a library name
LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET)

## Shared object suffix
SO = so
## Non-shared intermediate object suffix
STATIC_O = ao

## Compilation rules
%.$(STATIC_O): $(srcdir)/%.c
	$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
%.o: $(srcdir)/%.c
	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<

%.$(STATIC_O): $(srcdir)/%.cpp
	$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
%.o: $(srcdir)/%.cpp
	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<


## Dependency rules
%.d: $(srcdir)/%.c
	@echo "generating dependency information for $<"
	@$(SHELL) -ec '$(GEN_DEPS.c) $< \
		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
		[ -s $@ ] || rm -f $@'

%.d: $(srcdir)/%.cpp
	@echo "generating dependency information for $<"
	@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
		[ -s $@ ] || rm -f $@'

## Versioned libraries rules

%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
	$(RM) $@ && ln -s ${<F} $@
%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@

##  Bind internal references

# LDflags that pkgdata will use
BIR_LDFLAGS= -Wl,-Bsymbolic

# CPPflags for genccode/gencmn
BIR_CPPFLAGS= -DU_HAVE_BIND_INTERNAL_REFERENCES

# Dependencies [i.e. map files] for the final library
BIR_DEPS=

# Use LIBRARY_PATH instead of LD_LIBRARY_PATH
LDLIBRARYPATH_ENVVAR= LIBRARY_PATH

## End BeOS-specific setup


--- NEW FILE: mh-mpras ---
## -*-makefile-*-
## MP-RAS specific setup
## Copyright (c) 2003-2003, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-mpras,v 1.1 2004/04/06 10:08:09 chrislit Exp $
## Original contributer: Jason Gordon from NCR

## Flags for position independent code
SHAREDLIBCFLAGS = -K PIC
SHAREDLIBCXXFLAGS = -K PIC
SHAREDLIBCPPFLAGS = -DPIC

## Commands to generate dependency files
GEN_DEPS.c= $(CC) -Hnocopyr -I/usr/include -Hcpplvl=3 -Xa -Hmake $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc= $(CXX) -Hnocopyr -I/usr/include -Hcpplvl=3 -Xa -Hmake $(DEFS) $(CPPFLAGS)

## Commands to link
LINK.c=		$(CC) $(CXXFLAGS) $(LDFLAGS)
LINK.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS)

## Commands to make a shared library
SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -G
SHLIB.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS) -G

## Compiler switch to embed a runtime search path
LD_RPATH=     -YP,
LD_RPATH_PRE=	

## Compiler switch to embed a library name
LD_SONAME = -h $(MIDDLE_SO_TARGET)

## Shared object suffix
SO=		so
## Non-shared intermediate object suffix
STATIC_O = o

## Compilation rules
%.$(STATIC_O): $(srcdir)/%.c
	$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
%.o: $(srcdir)/%.c
	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<

%.$(STATIC_O): $(srcdir)/%.cpp
	$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
%.o: $(srcdir)/%.cpp
	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<


## Dependency rules
%.d : $(srcdir)/%.c
	@echo "generating dependency information for $<"
	@$(GEN_DEPS.c) $< > $@

%.d : $(srcdir)/%.cpp
	@echo "generating dependency information for $<"
	@$(GEN_DEPS.cc) $< > $@

## Versioned libraries rules

%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
	$(RM) $@ && ln -s $< $@
%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@


Index: Makefile.inc.in
===================================================================
RCS file: /cvs/core/icu-sword/source/config/Makefile.inc.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.inc.in	10 Sep 2003 02:42:05 -0000	1.6
+++ Makefile.inc.in	6 Apr 2004 10:08:09 -0000	1.7
@@ -43,6 +43,11 @@
 PACKAGE = @PACKAGE@
 LIBICU = lib$(ICUPREFIX)
 
+# Static library prefix and file extension
+STATIC_PREFIX = s
+LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
+A = a
+
 # Suffix at the end of libraries. Usually empty.
 ICULIBSUFFIX = @ICULIBSUFFIX@
 # ICULIBSUFFIX_VERSION  is non-empty if it is to contain a library

Index: icu-config-bottom
===================================================================
RCS file: /cvs/core/icu-sword/source/config/icu-config-bottom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2

Index: mh-aix
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-aix,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-aix	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-aix	6 Apr 2004 10:08:09 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## Aix-specific setup (for xlC)
-## Copyright (c) 1999-2002, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -84,8 +84,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : %.u

Index: mh-aix-va
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-aix-va,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-aix-va	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-aix-va	6 Apr 2004 10:08:09 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## Aix-specific setup (for Visual Age 5+)
-## Copyright (c) 1999-2002, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -15,7 +15,8 @@
 CFLAGS += -qproto -qroconst
 CXXFLAGS += -qproto -qroconst
 
-LDFLAGS += -brtl -bh:5
+# If you readd this line, you must change the SO value
+#LDFLAGS += -brtl
 
 ## We need to delete things prior to linking, or else we'll get
 ## SEVERE ERROR: output file in use ..  on AIX. 
@@ -57,7 +58,9 @@
 LD_SONAME = 
 
 ## Shared object suffix
-SO=		so
+#SO=	so
+# without the -brtl option, the library names use .a. AIX is funny that way.
+SO=	a
 ## Non-shared intermediate object suffix
 STATIC_O = o
 
@@ -81,8 +84,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : %.u

Index: mh-alpha-linux-cc
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-alpha-linux-cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-alpha-linux-cc	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-alpha-linux-cc	6 Apr 2004 10:08:09 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## Alpha-Linux-specific setup
-## Copyright (c) 1999-2000, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -57,8 +57,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 #%.d: $(srcdir)/%.c

Index: mh-alpha-linux-gcc
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-alpha-linux-gcc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-alpha-linux-gcc	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-alpha-linux-gcc	6 Apr 2004 10:08:09 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## Linux-specific setup
-## Copyright (c) 1999-2000, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -45,8 +45,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d: $(srcdir)/%.c

Index: mh-alpha-osf
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-alpha-osf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mh-alpha-osf	10 Sep 2003 02:42:05 -0000	1.3
+++ mh-alpha-osf	6 Apr 2004 10:08:09 -0000	1.4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## Alpha-Linux-specific setup
-## Copyright (c) 1999-2000, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -57,8 +57,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 #%.d: $(srcdir)/%.c

Index: mh-bsd-gcc
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-bsd-gcc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-bsd-gcc	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-bsd-gcc	6 Apr 2004 10:08:09 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## FreeBSD-specific setup
-## Copyright (c) 1999-2000, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -37,8 +37,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d: $(srcdir)/%.c

Index: mh-cygwin
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-cygwin,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-cygwin	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-cygwin	6 Apr 2004 10:08:09 -0000	1.6
@@ -57,8 +57,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d: $(srcdir)/%.c

Index: mh-cygwin-msvc
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-cygwin-msvc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mh-cygwin-msvc	10 Sep 2003 02:42:05 -0000	1.1
+++ mh-cygwin-msvc	6 Apr 2004 10:08:09 -0000	1.2
@@ -8,6 +8,8 @@
 ## Commands to generate dependency files
 GEN_DEPS.c=	:
 GEN_DEPS.cc=	:
+#GEN_DEPS.c=	$(COMPILE.c) /E
+#GEN_DEPS.cc=	$(COMPILE.cc) /E
 
 ## Flags for position independent code
 SHAREDLIBCFLAGS = 
@@ -16,15 +18,23 @@
 
 ## Additional flags when building libraries and with threads
 LIBCPPFLAGS = 
-THREADSCPPFLAGS = 
+# /MDd means 'compiles and links a debugable multithreaded program with DLL'
+#THREADSCFLAGS += /MDd
+#THREADSCXXFLAGS += /MDd
+# /MD means 'compiles and links a multithreaded program with DLL'
+THREADSCFLAGS += /MD
+THREADSCXXFLAGS += /MD
 
+# /GF pools strings and places them into read-only memory
+CFLAGS += /GF
+CXXFLAGS += /GF
 CPPFLAGS+=/nologo
 DEFS+=/D"WIN32"
 LDFLAGS+=/nologo
 
 # Commands to compile
-COMPILE.c=	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) /GF /c
-COMPILE.cc=	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) /GF /c
+COMPILE.c=	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) /c
+COMPILE.cc=	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) /c
 
 # Commands to link
 LINK.c=		LINK.EXE /subsystem:console $(LDFLAGS)
@@ -52,7 +62,7 @@
 IMPORT_LIB_EXT = .lib
 
 LIBICU = $(ICUPREFIX)
-DEFAULT_LIBS =
+DEFAULT_LIBS = advapi32.lib
 
 ## Link commands to link to ICU libs
 LIBICUDT=	$(top_builddir)/stubdata/$(LIBICU)data$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR).lib
@@ -76,37 +86,39 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) /Fo$@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) /Fo$@ $<
-
-## Dependency rules
-#%.d: $(srcdir)/%.c
-#	@echo "generating dependency information for $<"
-#	$(SHELL) -ec '$(GEN_DEPS.c) $< \
-#		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
-#		[ -s $@ ] || rm -f $@'
-#
-#%.d: $(srcdir)/%.cpp
-#	@echo "generating dependency information for $<"
-#	$(SHELL) -ec '$(GEN_DEPS.cc) $< \
-#		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
-#		[ -s $@ ] || rm -f $@'
 
 ## Dependency rules
+## This is a start to how depdendencies could work
+# The commented out rules may not properly delete the file when ^C is pressed
+#   or the compiler fails.
+# make currently doesn't like rules with C:\\PROGRA~1\\.. in the depedency.
+#   So system headers are ignored by ignoring \\
 %.d : $(srcdir)/%.c
 	@echo "generating dependency information for $<"
 	@$(GEN_DEPS.c) $< > $@
+#	@echo -n "generating dependency information for "
+#	@echo -n "$@ $(basename $<).o : " > $@
+#	@$(SHELL) -ec '$(GEN_DEPS.c) $< \
+#		| grep "#line 1 " | grep -v \\\\ | cut -d " " -f 3 \
+#		| /usr/bin/sort -u | sed s/\"$$/\\\\/ | sed s/^\"/\	/ >> $@ \
+#		|| (rm -f $@ && echo $@ && false)'
 
 %.d : $(srcdir)/%.cpp
 	@echo "generating dependency information for $<"
 	@$(GEN_DEPS.cc) $< > $@
+#	@echo -n "generating dependency information for "
+#	@echo -n "$@ $(basename $<).o : " > $@
+#	@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
+#		| grep "#line 1 " | grep -v \\\\ | cut -d " " -f 3 \
+#		| /usr/bin/sort -u | sed s/\"$$/\\\\/ | sed s/^\"/\	/ >> $@ \
+#		|| (rm -f $@ && echo $@ && false)'
 
 ## Compile a Windows resource file
 %.res : $(srcdir)/%.rc
-	@rc.exe /fo$@ $<
+	rc.exe /fo$@ $<
 
 ## Versioned target for a shared library.
-FINAL_SO_TARGET=  $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
+FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
 MIDDLE_SO_TARGET=$(SO_TARGET)
 
 ## Versioned import library names.
@@ -133,6 +145,13 @@
 
 # Environment variable to set a runtime search path
 LDLIBRARYPATH_ENVVAR = PATH
+
+# These are needed to allow the pkgdata nmake files to work
+PKGDATA_OPTS = -v
+PKGDATA_INVOKE_OPTS = MAKEFLAGS=
+
+# Include the version information in the shared library
+ENABLE_SO_VERSION_DATA=1
 
 ## End Cygwin-specific setup
 

Index: mh-darwin
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-darwin,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-darwin	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-darwin	6 Apr 2004 10:08:09 -0000	1.6
@@ -23,8 +23,11 @@
 COMPILE.cc=	$(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c
 
 ## Commands to make a shared library
-SHLIB.c=	$(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) -install_name $(MIDDLE_SO_TARGET)
-SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) -install_name $(MIDDLE_SO_TARGET)
+SHLIB.c=	$(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS)
+SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
+
+## Compiler switches to embed a library name and version information
+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(MIDDLE_SO_TARGET)
 
 ## Compiler switch to embed a runtime search path
 LD_RPATH=
@@ -38,10 +41,6 @@
 ## Non-shared intermediate object suffix
 STATIC_O = ao
 
-## Versioned target for a shared library.
-FINAL_SO_TARGET  = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
-MIDDLE_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
-
 ## Compilation rules
 %.$(STATIC_O): $(srcdir)/%.c
 	$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
@@ -53,13 +52,11 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : $(srcdir)/%.c
 	@echo "generating dependency information for $<"
-	@$(GEN_DEPS.c) $< -o $@
+	@$(GEN_DEPS.c) $< > /dev/null
 	@mv $@ $@~
 	@echo -n "$@ " > $@
 	@cat < $@~ >> $@
@@ -67,18 +64,17 @@
 
 %.d : $(srcdir)/%.cpp
 	@echo "generating dependency information for $<"
-	@$(GEN_DEPS.cc) $< -o $@
+	@$(GEN_DEPS.cc) $< >/dev/null
 	@mv $@ $@~
-	@( echo '/\.[ch]$$' ; echo '+,$$d' ; echo "wq" ) | ed $@~ 2>/dev/null >/dev/null || exit 0
 	@echo -n "$@ " > $@
 	@cat < $@~ >> $@
 	@-rm $@~
 
 ## Versioned libraries rules
 
-%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO)
-	$(RM) $@ && ln -s ${<F} $@
-%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO)
-	$(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@
+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
+	$(RM) $@ && ln -s $< $@
+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
+	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
 
-## End Darwin-specific setup
+## End Darwin-specific setup
\ No newline at end of file

Index: mh-hpux-acc
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-hpux-acc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-hpux-acc	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-hpux-acc	6 Apr 2004 10:08:09 -0000	1.6
@@ -13,6 +13,11 @@
 SHAREDLIBCFLAGS = +z
 SHAREDLIBCXXFLAGS = +z
 
+## Additional flags when building libraries with threads
+## We use this instead of -mt, which isn't available in all versions of aCC
+## Our tools won't compile with -D_POSIX_C_SOURCE=199506L
+THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
+
 # Use Extended ANSI mode, which is useful for 64-bit numbers
 # +Olibcalls uses intrinsic functions for strlen and others
 # +W ignores some warnings
@@ -20,8 +25,10 @@
 #    740 Unsafe cast between pointers/references to incomplete classes...
 #    749 This operation is non-portable and potentially unsafe.
 #        (Ironically the solution to fix this warning is non-portable)
+#    823 Redundant preprocessing concatenation operation results in two valid
+#        preprocessing tokens. This comes from INT64_C in <inttypes.h>
 CFLAGS += +Olibcalls -Ae +ESlit
-CXXFLAGS += +Olibcalls +W495 +W740 +W749
+CXXFLAGS += +Olibcalls +W495 +W740 +W749 +W823
 
 ## Commands to compile
 COMPILE.c=	$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c
@@ -70,8 +77,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : $(srcdir)/%.c

Index: mh-hpux-cc
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-hpux-cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-hpux-cc	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-hpux-cc	6 Apr 2004 10:08:09 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## HP/UX-specific setup using CC
-## Copyright (c) 1999-2000, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -57,8 +57,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : $(srcdir)/%.c

Index: mh-hpux-gcc
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-hpux-gcc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mh-hpux-gcc	10 Sep 2003 02:42:05 -0000	1.1
+++ mh-hpux-gcc	6 Apr 2004 10:08:09 -0000	1.2
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## HPUX/gcc specific setup
-## Copyright (c) 1999-2001, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -56,8 +56,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : $(srcdir)/%.c

Index: mh-irix
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-irix,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-irix	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-irix	6 Apr 2004 10:08:09 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## IRIX-specific setup (for CC)
-## Copyright (c) 1999-2000, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -48,8 +48,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : $(srcdir)/%.c

Index: mh-linux
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-linux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-linux	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-linux	6 Apr 2004 10:08:09 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## Linux-specific setup
-## Copyright (c) 1999-2001, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -41,8 +41,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d: $(srcdir)/%.c

Index: mh-os390
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-os390,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-os390	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-os390	6 Apr 2004 10:08:09 -0000	1.6
@@ -126,8 +126,10 @@
 endif
 
 BATCH_COMMON_TARGET="//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}UC)'"
-BATCH_I18N_TARGET=	"//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}IN)'"
+BATCH_I18N_TARGET="//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}IN)'"
 BATCH_USTDIO_TARGET="//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}IO)'"
+BATCH_LAYOUT_TARGET="//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}LE)'"
+BATCH_LAYOUTEX_TARGET="//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}LX)'"
 
 BATCH_LIBICUUC=		"//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}UC)'"
 BATCH_LIBICUI18N=	"//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}IN)'"
@@ -184,5 +186,8 @@
 	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
 %.$(SO): %$(SO_TARGET_VERSION).$(SO)
 	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
+
+## Install libraries as executable
+INSTALL-L=$(INSTALL_PROGRAM)
 
 ## End 390-specific setup

Index: mh-os400
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-os400,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6

Index: mh-ptx
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-ptx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6

Index: mh-qnx
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-qnx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mh-qnx	10 Sep 2003 02:42:05 -0000	1.1
+++ mh-qnx	6 Apr 2004 10:08:10 -0000	1.2
@@ -53,8 +53,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d: $(srcdir)/%.c

Index: mh-solaris
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-solaris,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-solaris	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-solaris	6 Apr 2004 10:08:10 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## Solaris-specific setup using Sun's workshop compilers
-## Copyright (c) 1999-2000, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -18,8 +18,8 @@
 CPPFLAGS += -libmil
 
 # -mt means 'compiles and links a multithreaded program'
-CFLAGS += -mt
-CXXFLAGS += -mt
+THREADSCFLAGS += -mt
+THREADSCXXFLAGS += -mt
 
 ## Commands to link
 ## For Sun Workshop, use CC to link to bring in C++ runtime
@@ -53,8 +53,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : $(srcdir)/%.c

Index: mh-solaris-gcc
===================================================================
RCS file: /cvs/core/icu-sword/source/config/mh-solaris-gcc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mh-solaris-gcc	10 Sep 2003 02:42:05 -0000	1.5
+++ mh-solaris-gcc	6 Apr 2004 10:08:10 -0000	1.6
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ## Solaris-specific setup using gcc
-## Copyright (c) 1999-2000, International Business Machines Corporation and
+## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
 ## $Id$
@@ -14,10 +14,6 @@
 GEN_DEPS.c= 	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
 GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)
 
-## Commands to make a shared library
-SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -G
-SHLIB.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS) -G
-
 ## Compiler switch to embed a runtime search path
 LD_RPATH=	-R
 LD_RPATH_PRE=	
@@ -41,8 +37,6 @@
 %.o: $(srcdir)/%.cpp
 	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
 
-../data/%.o: ../data/%.c
-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
 
 ## Dependency rules
 %.d : $(srcdir)/%.c



