AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-1868 Properly use CPPFLAGS and other flags

Browse Source 
X-SVN-Rev: 8613
This commit is contained in:
George Rhoten 2002-05-13 23:51:50 +00:00
parent 65eb5971c0
commit 1a09ea5eda
31 changed files with 111 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
icu4c/source/common/Makefile.in
View File

@ -45,12 +45,11 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
CPPFLAGS += $(LIBCPPFLAGS)
# Data packaging options are set at configure time with --with-data-packaging.
DEFS += -I. -I$(srcdir) -DICU_DATA_DIR=\"$(ICUDATA_DIR)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\" @DATA_PACKAGING_CPPFLAGS@
CPPFLAGS += -I. -I$(srcdir) $(LIBCPPFLAGS) @DATA_PACKAGING_CPPFLAGS@
DEFS += -DICU_DATA_DIR=\"$(ICUDATA_DIR)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\"
# todo: need t make $(LIBICUDT) conditional on using dll-based data.
# $(LIBICUDT) is either stub data or the real DLL common data.
LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
OBJECTS = putil.o locmap.o mutex.o umutex.o \

12
icu4c/source/config/mh-aix
View File

@ -3,7 +3,7 @@
## Copyright (c) 1999-2002, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-aix,v 1.30 2002/05/07 03:10:13 srl Exp $
## $Id: mh-aix,v 1.31 2002/05/13 23:50:12 grhoten-oss Exp $
##
## 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
@ -12,17 +12,17 @@
GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc= $(CXX) -E -M $(DEFS) $(CPPFLAGS)
## Commands to compile
COMPILE.c= $(CC) -qroconst $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
COMPILE.cc= $(CXX) -qroconst $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c
# Make the strings readonly. This helps in the common data library
CFLAGS += -qroconst
CXXFLAGS += -qroconst
LDFLAGS += -brtl
## 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= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
## Commands to make a shared library
SHLIB.c= $(AIX_SHLIB) -p 5000 $(LDFLAGS)

12
icu4c/source/config/mh-aix-va
View File

@ -3,23 +3,23 @@
## Copyright (c) 1999-2002, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-aix-va,v 1.23 2002/05/07 03:10:14 srl Exp $
## $Id: mh-aix-va,v 1.24 2002/05/13 23:50:12 grhoten-oss Exp $
## Commands to generate dependency files
GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc= $(CXX) -E -M $(DEFS) $(CPPFLAGS)
## Commands to compile
COMPILE.c= $(CC) -qroconst $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
COMPILE.cc= $(CXX) -qroconst $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c
# Make the strings readonly. This helps in the common data library
CFLAGS += -qroconst
CXXFLAGS += -qroconst
LDFLAGS += -brtl -bh:5
## 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= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
## Commands to make a shared library
## -G means -berok -brtl -bnortllib -bnosymbolic -bnoautoexp

21
icu4c/source/config/mh-alpha-linux-cc
View File

@ -3,7 +3,7 @@
## Copyright (c) 1999-2000, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-alpha-linux-cc,v 1.6 2002/01/04 23:48:42 yves-oss Exp $
## $Id: mh-alpha-linux-cc,v 1.7 2002/05/13 23:50:12 grhoten-oss Exp $
## Commands to generate dependency files
#GEN_DEPS.c= $(CC) $(DEFS) $(CPPFLAGS) -MD -c -msg_quiet
@ -18,18 +18,21 @@ SHAREDLIBCPPFLAGS = -DPIC
LIBCPPFLAGS = -D_REENTRANT
THREADSCPPFLAGS = -D_REENTRANT
# Use int for int32_t
DEFS += -D_LP64
# The tests need complete IEEE floating point support
CFLAGS += -ieee
CXXFLAGS += -ieee
## Commands to compile
COMPILE.c= $(CC) -D_LP64 $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -signed -accept nogccinline -ieee
COMPILE.cc= $(CXX) -D_LP64 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c -signed -D__USE_STD_IOSTREAM -accept nogcc_inline -ieee
COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -signed -accept nogccinline
COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c -signed -D__USE_STD_IOSTREAM -accept nogcc_inline
## Commands to link
LINK.c= $(CC) -D_LP64 -call_shared $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -ieee
LINK.cc= $(CXX) -D_LP64 -call_shared $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -ieee
## Commands to make a shared library
SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
LINK.c= $(CC) -call_shared $(CFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) -call_shared $(CXXFLAGS) $(LDFLAGS)
## Compiler switch to embed a runtime search path
LD_RPATH=

12
icu4c/source/config/mh-alpha-linux-gcc
View File

@ -3,7 +3,7 @@
## Copyright (c) 1999-2000, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-alpha-linux-gcc,v 1.5 2002/01/04 23:48:42 yves-oss Exp $
## $Id: mh-alpha-linux-gcc,v 1.6 2002/05/13 23:50:12 grhoten-oss Exp $
## Commands to generate dependency files
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
@ -18,13 +18,9 @@ SHAREDLIBCPPFLAGS = -DPIC
LIBCPPFLAGS = -D_REENTRANT
THREADSCPPFLAGS = -D_REENTRANT
## Commands to compile
COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -mieee
COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c -mieee
## Commands to make a shared library
SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
# The tests need complete IEEE floating point support
CFLAGS += -mieee
CXXFLAGS += -mieee
## Compiler switch to embed a runtime search path
LD_RPATH=

21
icu4c/source/config/mh-alpha-osf
View File

@ -3,7 +3,7 @@
## Copyright (c) 1999-2000, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-alpha-osf,v 1.2 2002/01/04 23:48:42 yves-oss Exp $
## $Id: mh-alpha-osf,v 1.3 2002/05/13 23:50:12 grhoten-oss Exp $
## Commands to generate dependency files
#GEN_DEPS.c= $(CC) $(DEFS) $(CPPFLAGS) -MD -c -msg_quiet
@ -18,18 +18,21 @@ SHAREDLIBCPPFLAGS =
LIBCPPFLAGS = -D_REENTRANT
THREADSCPPFLAGS = -D_REENTRANT
# Use int for int32_t
DEFS += -D_LP64
# The tests need complete IEEE floating point support
CFLAGS += -ieee
CXXFLAGS += -ieee
## Commands to compile
COMPILE.c= $(CC) -D_LP64 $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -ieee
COMPILE.cc= $(CXX) -D_LP64 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c -D__USE_STD_IOSTREAM -ieee
COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c
COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c -D__USE_STD_IOSTREAM
## Commands to link
LINK.c= $(CC) -D_LP64 -call_shared $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) -D_LP64 -call_shared $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
## Commands to make a shared library
SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
LINK.c= $(CC) -call_shared $(CFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) -call_shared $(CXXFLAGS) $(LDFLAGS)
## Compiler switch to embed a runtime search path
LD_RPATH= $(LD_RPATH)$(LD_RPATH_PRE)path1

25
icu4c/source/config/mh-hpux-acc
View File

@ -3,30 +3,39 @@
## Copyright (c) 1999-2002, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-hpux-acc,v 1.28 2002/05/01 23:48:10 grhoten-oss Exp $
## $Id: mh-hpux-acc,v 1.29 2002/05/13 23:50:13 grhoten-oss Exp $
## Commands to generate dependency files
GEN_DEPS.c= :
GEN_DEPS.cc= :
## Flags for position independent code
SHAREDLIBCFLAGS = +z
SHAREDLIBCXXFLAGS = +z
# Use Extended ANSI mode, which is useful for 64-bit numbers
CFLAGS += -Ae
## Commands to compile
COMPILE.c= $(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +ESlit
COMPILE.cc= $(CXX) +z $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c
COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +ESlit
COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c
## Common 'default' path to ensure the sanity of users. Search the current
## directory, at least.
LD_DEFAULTPATH= -Wl,+b,.:'$$'ORIGIN/
# Use SHLIB_PATH and LD_LIBRARY_PATH to locate shared libraries
LDFLAGS += -Wl,+s $(LD_DEFAULTPATH)
## Commands to link
## For aCC, use the C++ linker so that __shlinit gets defined
#LINK.c= $(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
LINK.c= $(CXX) +z $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH)
LINK.cc= $(CXX) +z $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH)
LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
## Commands to make a shared library
#SHLIB.c= $(LD) $(LDFLAGS) -b
SHLIB.c= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH)
SHLIB.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH)
SHLIB.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) -b
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -b
## Compiler switch to embed a runtime search path
LD_RPATH= -Wl,+b,

17
icu4c/source/config/mh-solaris
View File

@ -3,7 +3,7 @@
## Copyright (c) 1999-2000, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-solaris,v 1.28 2002/05/01 23:48:08 grhoten-oss Exp $
## $Id: mh-solaris,v 1.29 2002/05/13 23:50:13 grhoten-oss Exp $
## Flags for position independent code
SHAREDLIBCFLAGS = -KPIC
@ -14,19 +14,18 @@ SHAREDLIBCPPFLAGS = -DPIC
GEN_DEPS.c= $(CC) -xM $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS)
## Commands to compile
COMPILE.c= $(CC) -mt $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
COMPILE.cc= $(CXX) -mt $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c
# -mt means 'compiles and links a multithreaded program'
CFLAGS += -mt
CXXFLAGS += -mt
## Commands to link
#LINK.c= $(CC) -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
## For Sun Workshop, use CC to link to bring in C++ runtime
LINK.c= $(CXX) -mt $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) -mt $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
## Commands to make a shared library
SHLIB.c= $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G
SHLIB.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G
SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -G
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G
## Compiler switch to embed a runtime search path
LD_RPATH= -R

2
icu4c/source/extra/uconv/Makefile.in
View File

@ -43,7 +43,7 @@ CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES)
## Target information
TARGET = uconv
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
ifeq ($(UCONVMSG_STATIC),YES)

3
icu4c/source/extra/ustdio/Makefile.in
View File

@ -39,8 +39,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
CPPFLAGS += $(LIBCPPFLAGS)
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS)
LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS)
OBJECTS = locbund.o loccache.o ufile.o ufmt_cmn.o uprintf.o uprntf_p.o \

3
icu4c/source/i18n/Makefile.in
View File

@ -39,8 +39,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
CPPFLAGS += $(LIBCPPFLAGS)
DEFS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common
CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS)
LIBS = $(LIBICUUC) $(DEFAULT_LIBS)
OBJECTS = ucln_in.o \

24
icu4c/source/icudefs.mk.in
View File

@ -92,11 +92,17 @@ RANLIB = @RANLIB@
# Various flags for the tools
DEFS = -I. @DEFS@
# DEFS is for common macro definitions
DEFS = @DEFS@
# CFLAGS is for C only flags
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
# CXXFLAGS is for C++ only flags
CXXFLAGS = @CXXFLAGS@
# CPPFLAGS is for C Pre-Processor flags
CPPFLAGS = -I. @CPPFLAGS@
# DEFAULT_LIBS are the default libraries to link against
DEFAULT_LIBS = @LIBS@
# LIB_M is for linking against the math library
LIB_M = @LIB_M@
ENABLE_RPATH = @ENABLE_RPATH@
@ -115,16 +121,16 @@ ECHO_N = @ECHO_N@
ECHO_C = @ECHO_C@
# Commands to compile
COMPILE.c= $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c
COMPILE.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c
COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c
# Commands to link
LINK.c= $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
LINK.c= $(CC) $(CFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
# Commands to make a shared library
SHLIB.c= $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
SHLIB.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
# Environment variable to set a runtime search path
LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
@ -148,7 +154,7 @@ INSTALL-L = $(INSTALL_DATA)
LIBICUDT= -L$(top_builddir)/data/out -L$(top_builddir)/stubdata -l$(ICUPREFIX)data$(ICULIBSUFFIX)
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc$(ICULIBSUFFIX) $(LIBICUDT)
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n$(ICULIBSUFFIX)
LIBICULE= -L$(top_builddir)/layout -l$(ICUPREFIX)le$(ICULIBSSUFFIX)
LIBICULE= -L$(top_builddir)/layout -l$(ICUPREFIX)le$(ICULIBSUFFIX)
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)
LIBICUTOOLUTIL= -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil$(ICULIBSUFFIX)
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio$(ICULIBSUFFIX)

3
icu4c/source/layout/Makefile.in
View File

@ -36,8 +36,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
CPPFLAGS += $(LIBCPPFLAGS)
DEFS += -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common
CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS)
LIBS = $(DEFAULT_LIBS)

3
icu4c/source/stubdata/Makefile.in
View File

@ -39,8 +39,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
CPPFLAGS += $(LIBCPPFLAGS)
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS)
OBJECTS = stubdata.o

4
icu4c/source/test/cintltst/Makefile.in
View File

@ -32,8 +32,8 @@ endif
BUILDDIR := $(shell pwd)/../..
# we define ICU_UNICODE_VERSION so we can test it
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \
-DICU_UNICODE_VERSION=\"$(UNICODE_VERSION)\" -DICU_VERSION=\"@VERSION@\" -DICUDATA_NAME=\"$(ICUDATA_PLATFORM_NAME)\" -DU_TOPSRCDIR=\"$(top_srcdir)/\" -DU_TOPBUILDDIR=\"$(BUILDDIR)\"
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil
DEFS += -DICU_UNICODE_VERSION=\"$(UNICODE_VERSION)\" -DICU_VERSION=\"@VERSION@\" -DICUDATA_NAME=\"$(ICUDATA_PLATFORM_NAME)\" -DU_TOPSRCDIR=\"$(top_srcdir)/\" -DU_TOPBUILDDIR=\"$(BUILDDIR)\"
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = callcoll.o calltest.o capitst.o cbiapts.o cbkittst.o \

3
icu4c/source/test/intltest/Makefile.in
View File

@ -20,7 +20,8 @@ CLEANFILES = *~ $(DEPS)
TARGET = intltest
BUILDDIR := $(shell pwd)/../..
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil
DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = allcoll.o apicoll.o callimts.o calregts.o caltest.o \

7
icu4c/source/test/iotest/Makefile.in
View File

@ -19,10 +19,9 @@ CLEANFILES = *~ $(DEPS)
## Target information
TARGET = iotest
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n \
-I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \
-I$(top_srcdir)/extra/ustdio
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(LIBUSTDIO) $(DEFAULT_LIBS) $(LIB_M)
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n \
-I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/extra/ustdio
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBUSTDIO) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = iotest.o

15
icu4c/source/tools/dumpce/Makefile.in
View File

@ -10,9 +10,6 @@ top_builddir = ../..
include $(top_builddir)/icudefs.mk
## Platform-specific setup
include @platform_make_fragment@
## Build directory information
subdir = tools/dumpce
@ -22,16 +19,8 @@ CLEANFILES = *~ $(DEPS)
## Target information
TARGET = dumpce
DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
ENABLE_RPATH = @ENABLE_RPATH@
ifeq ($(ENABLE_RPATH),YES)
RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
endif
LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) @LIBS@ @LIB_M@
CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil
LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = dumpce.o

3
icu4c/source/tools/genccode/Makefile.in
View File

@ -28,8 +28,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(ALL_MAN_FILES)
## Target information
TARGET = genccode
CPPFLAGS += $(BIR_CPPFLAGS)
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS)
LIBS = $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) $(LIBICUTOOLUTIL)
OBJECTS = genccode.o

3
icu4c/source/tools/gencmn/Makefile.in
View File

@ -29,8 +29,7 @@ CLEANFILES = *~ mkmap.tmp $(DEPS) $(RES_FILES) $(TEST_FILES) $(DECMN_DEP) $(ALL_
TARGET = gencmn
DECMN = decmn
CPPFLAGS += $(BIR_CPPFLAGS)
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS)
LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = gencmn.o

2
icu4c/source/tools/gencnval/Makefile.in
View File

@ -34,7 +34,7 @@ CLEANFILES = *~ $(GENERATED_MAN_FILES) $(DEPS) $(RES_FILES) $(TEST_FILES)
## Target information
TARGET = gencnval
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = gencnval.o

2
icu4c/source/tools/gennames/Makefile.in
View File

@ -34,7 +34,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(ALL_MAN_FILES)
## Target information
TARGET = gennames
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = gennames.o

2
icu4c/source/tools/gennorm/Makefile.in
View File

@ -29,7 +29,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES)
## Target information
TARGET = gennorm
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = gennorm.o store.o

2
icu4c/source/tools/genprops/Makefile.in
View File

@ -29,7 +29,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES)
## Target information
TARGET = genprops
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = genprops.o props2.o propsvec.o store.o

2
icu4c/source/tools/genrb/Makefile.in
View File

@ -26,7 +26,7 @@ CLEANFILES = *~ $(MAN_FILES) $(DEPS)
TARGET = genrb
DERB = derb
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
LIBS = $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o util.o \

2
icu4c/source/tools/gentest/Makefile.in
View File

@ -25,7 +25,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES)
## Target information
TARGET = gentest
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = gentest.o

2
icu4c/source/tools/gentz/Makefile.in
View File

@ -31,7 +31,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES)
## Target information
TARGET = gentz
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = gentz.o

2
icu4c/source/tools/genuca/Makefile.in
View File

@ -25,7 +25,7 @@ CLEANFILES = *~ $(TARGET).$(SECTION) $(DEPS)
## Target information
TARGET = genuca
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
LIBS = $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = genuca.o

2
icu4c/source/tools/makeconv/Makefile.in
View File

@ -31,7 +31,7 @@ CLEANFILES = *~ $(GENERATED_MAN_FILES) $(DEPS) $(CNV_FILES) $(TEST_CNV_FILES)
## Target information
TARGET = makeconv
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = makeconv.o ucnvstat.o genmbcs.o

3
icu4c/source/tools/pkgdata/Makefile.in
View File

@ -28,7 +28,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) mkmap.tmp $(ALL_MAN_FILES)
## Target information
TARGET = pkgdata
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
DEFS += -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = pkgdata.o pkgtypes.o gmake.o dllmode.o cmnmode.o filemode.o sttcmode.o

3
icu4c/source/tools/toolutil/Makefile.in
View File

@ -35,8 +35,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
CPPFLAGS += $(LIBCPPFLAGS)
DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw $(LIBCPPFLAGS)
LIBS = $(LIBICUUC) $(DEFAULT_LIBS)
OBJECTS = toolutil.o unewdata.o ucmpwrit.o uoptions.o uparse.o ucbuf.o