ICU-3673 Fix *_FALSE and ustdio usage
X-SVN-Rev: 14815
This commit is contained in:
George Rhoten
parent
6b92d9ad19
commit
3ab00f7a93
@ -22,17 +22,13 @@ docsubdir = $(PACKAGE)$(ICULIBDASHSUFFIX)/html
|
||||
## Build directory information
|
||||
subdir = .
|
||||
|
||||
AUTOCONF = @AUTOCONF@
|
||||
#AUTOCONF = @AUTOCONF@
|
||||
|
||||
## Optional directory setup
|
||||
@EXTRAS_TRUE@EXTRA = extra
|
||||
@EXTRAS_FALSE@EXTRA =
|
||||
@LAYOUT_TRUE@LAYOUT = layout layoutex
|
||||
@LAYOUT_FALSE@LAYOUT =
|
||||
@TESTS_TRUE@TEST = test
|
||||
@TESTS_FALSE@TEST =
|
||||
@SAMPLES_TRUE@SAMPLE = samples
|
||||
@SAMPLES_FALSE@SAMPLE =
|
||||
|
||||
DOXYGEN = @DOXYGEN@
|
||||
|
||||
|
||||
5
icu4c/source/aclocal.m4
vendored
5
icu4c/source/aclocal.m4
vendored
@ -67,16 +67,13 @@ esac
|
||||
)
|
||||
])
|
||||
|
||||
dnl ICU_CONDITIONAL - Taken from Automake 1.4
|
||||
dnl ICU_CONDITIONAL - similar example taken from Automake 1.4
|
||||
AC_DEFUN(ICU_CONDITIONAL,
|
||||
[AC_SUBST($1_TRUE)
|
||||
AC_SUBST($1_FALSE)
|
||||
if $2; then
|
||||
$1_TRUE=
|
||||
$1_FALSE='#'
|
||||
else
|
||||
$1_TRUE='#'
|
||||
$1_FALSE=
|
||||
fi])
|
||||
|
||||
dnl AC_SEARCH_LIBS_FIRST(FUNCTION, SEARCH-LIBS [, ACTION-IF-FOUND
|
||||
|
||||
@ -52,7 +52,7 @@ typedef enum ECleanupLibraryType {
|
||||
UCLN_CUSTOM, /* Custom is for anyone else. */
|
||||
UCLN_LAYOUTEX,
|
||||
UCLN_LAYOUT,
|
||||
UCLN_USTDIO,
|
||||
UCLN_IO,
|
||||
UCLN_I18N,
|
||||
UCLN_COMMON /* This must be the last one to cleanup. */
|
||||
} ECleanupLibraryType;
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
* The catgets function is commonly used in combination with functions
|
||||
* like printf and strftime. ICU components like message format can
|
||||
* be used instead, although they use a different format syntax.
|
||||
* There is an unsupported ICU package, ustdio, that provides some of
|
||||
* There is an ICU package, icuio, that provides some of
|
||||
* the POSIX-style formatting API.
|
||||
*/
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
## -*-makefile-*-
|
||||
#******************************************************************************
|
||||
# Copyright (C) 1999-2003, International Business Machines
|
||||
# Copyright (C) 1999-2004, International Business Machines
|
||||
# Corporation and others. All Rights Reserved.
|
||||
# $Revision: 1.38 $
|
||||
# $Revision: 1.39 $
|
||||
#******************************************************************************
|
||||
# This Makefile.inc is designed to be included into projects which make use
|
||||
# of the ICU.
|
||||
@ -87,14 +87,14 @@ endif
|
||||
# 3. optionally, add one or more of:
|
||||
# - $(ICULIBS_I18N) - i18n library, formatting, etc.
|
||||
# - $(ICULIBS_LAYOUT) - ICU layout library.
|
||||
# - $(ICULIBS_USTDIO) - ICU stdio equivalent library
|
||||
# - $(ICULIBS_ICUIO) - ICU stdio equivalent library
|
||||
|
||||
ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_DATA = -l$(ICUPREFIX)data$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_I18N = -l$(ICUPREFIX)i18n$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_TOOLUTIL = -l$(ICUPREFIX)toolutil$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_USTDIO = -licuio$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
## -*-sh-*-
|
||||
## BEGIN of icu-config-bottom. $Revision: 1.10 $
|
||||
## Copyright (c) 2002-2003, International Business Machines Corporation and
|
||||
## BEGIN of icu-config-bottom. $Revision: 1.11 $
|
||||
## Copyright (c) 2002-2004, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
|
||||
ICUUC_FILE=${libdir}/${ICULIBS_COMMON_LIB_NAME}
|
||||
@ -46,7 +46,7 @@ allflags()
|
||||
echo " --ldflags-libsonly Same as --ldflags, but only the -l directives"
|
||||
echo " --ldflags-searchpath Print only -L (search path) directive"
|
||||
echo " --ldflags-system Print only system libs ICU links with (-lpthread, -lm)"
|
||||
echo " --ldflags-ustdio Print ICU ustdio link directive. Use in addition to --ldflags "
|
||||
echo " --ldflags-icuio Print ICU icuio link directive. Use in addition to --ldflags "
|
||||
echo " --ldflags-obsolete Print ICU obsolete link directive. Use in addition to --ldflags. (requires icuapps/obsolete to be built and installed.) "
|
||||
echo " --mandir Print manpage (man) path"
|
||||
echo " --prefix Print PREFIX to icu install (/usr/local)"
|
||||
@ -218,8 +218,8 @@ do
|
||||
echo $ICULIBS_I18N $ICULIBS_COMMON $ICULIBS_DATA
|
||||
;;
|
||||
|
||||
--ldflags-ustdio)
|
||||
echo $ICULIBS_USTDIO
|
||||
--ldflags-icuio)
|
||||
echo $ICULIBS_ICUIO
|
||||
;;
|
||||
|
||||
--ldflags-obsolete)
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
.\"
|
||||
.\" icu-config.1: manual page for the icu-config utility
|
||||
.\"
|
||||
.\" Copyright (C) 2002 IBM, Inc. and others.
|
||||
.\" Copyright (C) 2002-2004 IBM, Inc. and others.
|
||||
.\"
|
||||
.\" Based on Yves Arrouye's pkgdata page <yves@arrouye.net>
|
||||
.\" Modified by Steven R. Loomis <srl@jtcsv.com>.
|
||||
.\" With help from http://www.igpm.rwth-aachen.de/~albrecht/manpage.html
|
||||
|
||||
.TH ICU-CONFIG 1 "17 May 2002" "ICU MANPAGE" "ICU @VERSION@ Manual"
|
||||
.\".Dd "17 May 2002"
|
||||
.TH ICU-CONFIG 1 "17 May 2004" "ICU MANPAGE" "ICU @VERSION@ Manual"
|
||||
.\".Dd "17 May 2004"
|
||||
.\".Dt ICU-CONFIG 1
|
||||
.\".Os
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
.BI "\-\-ldflags\-system"
|
||||
]
|
||||
[
|
||||
.BI "\-\-ldflags\-ustdio"
|
||||
.BI "\-\-ldflags\-icuio"
|
||||
]
|
||||
[
|
||||
.BI "\-\-mandir"
|
||||
@ -233,15 +233,15 @@ Print any flags which should be passed to the linker. These may include
|
||||
this option will attempt to link in the "common" (libicuuc) and "i18n"
|
||||
(libicui18n) libraries, as well as the data library. If additional libraries
|
||||
are required, any of the following two flags may be added in conjunction with this one,
|
||||
for example "\-\-ldflags \-\-ldflags-ustdio" if the ustdio library is required
|
||||
for example "\-\-ldflags \-\-ldflags-icuio" if the icuio library is required
|
||||
in addition to the standard ICU libraries.
|
||||
Equivalent to the $(LDFLAGS) Makefile variable.
|
||||
.TP
|
||||
.BI "\-\-ldflags\-layout"
|
||||
Prints the link option for the ICU layout library.
|
||||
.TP
|
||||
.BI "\-\-ldflags\-ustdio"
|
||||
Prints the link option to add the UStdio package
|
||||
.BI "\-\-ldflags\-icuio"
|
||||
Prints the link option to add the ICU I/O package
|
||||
.TP
|
||||
.BI "\-\-ldflags\-libsonly"
|
||||
Similar to \fI\-\-ldflags\fP but only includes the \-l options.
|
||||
@ -284,5 +284,5 @@ Steven Loomis
|
||||
.SH VERSION
|
||||
@VERSION@
|
||||
.SH COPYRIGHT
|
||||
Copyright (C) 2002 IBM, Inc. and others.
|
||||
Copyright (C) 2002-2004 IBM, Inc. and others.
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
## Copyright (c) 2001-2004, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-cygwin,v 1.19 2004/03/27 00:37:02 grhoten-oss Exp $
|
||||
## $Id: mh-cygwin,v 1.20 2004/04/01 00:21:57 grhoten-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
@ -43,7 +43,7 @@ LIBICULE= -L$(LIBDIR) -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)
|
||||
LIBICULX= -L$(LIBDIR) -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw/ -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)
|
||||
LIBICUTOOLUTIL= -L$(LIBDIR) -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)
|
||||
LIBUSTDIO= -L$(LIBDIR) -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)
|
||||
LIBICUIO= -L$(LIBDIR) -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR)
|
||||
|
||||
|
||||
## Compilation rules
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
## Copyright (c) 2001-2004, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-cygwin-msvc,v 1.21 2004/03/31 22:33:46 grhoten-oss Exp $
|
||||
## $Id: mh-cygwin-msvc,v 1.22 2004/04/01 00:21:57 grhoten-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= :
|
||||
@ -18,12 +18,16 @@ SHAREDLIBCPPFLAGS =
|
||||
|
||||
## Additional flags when building libraries and with threads
|
||||
LIBCPPFLAGS =
|
||||
|
||||
ifeq ($(ENABLE_DEBUG),1)
|
||||
# /MDd means 'compiles and links a debugable multithreaded program with DLL'
|
||||
#THREADSCFLAGS += /MDd
|
||||
#THREADSCXXFLAGS += /MDd
|
||||
THREADSCFLAGS += /MDd
|
||||
THREADSCXXFLAGS += /MDd
|
||||
else
|
||||
# /MD means 'compiles and links a multithreaded program with DLL'
|
||||
THREADSCFLAGS += /MD
|
||||
THREADSCXXFLAGS += /MD
|
||||
endif
|
||||
|
||||
# /GF pools strings and places them into read-only memory
|
||||
# /GX enables exception handling
|
||||
@ -77,7 +81,7 @@ LIBICULE= $(LIBDIR)/$(LIBICU)le$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR).lib
|
||||
LIBICULX= $(LIBDIR)/$(LIBICU)lx$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR).lib
|
||||
LIBCTESTFW= $(top_builddir)/tools/ctestfw/$(LIBICU)ctestfw$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR).lib
|
||||
LIBICUTOOLUTIL= $(LIBDIR)/$(LIBICU)tu$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR).lib
|
||||
LIBUSTDIO= $(LIBDIR)/$(LIBICU)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR).lib
|
||||
LIBICUIO= $(LIBDIR)/$(LIBICU)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION_MAJOR).lib
|
||||
|
||||
# Current full path directory.
|
||||
CURR_FULL_DIR=$(shell cygpath -wma .)
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
## Copyright (c) 1999-2004, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-os390,v 1.60 2004/03/26 22:33:12 grhoten-oss Exp $
|
||||
## $Id: mh-os390,v 1.61 2004/04/01 00:21:57 grhoten-oss Exp $
|
||||
|
||||
###################################################################
|
||||
# IMPORTANT NOTE #
|
||||
@ -127,13 +127,13 @@ endif
|
||||
|
||||
BATCH_COMMON_TARGET="//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}UC)'"
|
||||
BATCH_I18N_TARGET="//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}IN)'"
|
||||
BATCH_USTDIO_TARGET="//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}IO)'"
|
||||
BATCH_IO_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)'"
|
||||
BATCH_LIBICUSTDIO= "//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}IO)'"
|
||||
BATCH_LIBICUIO= "//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}IO)'"
|
||||
BATCH_LIBICULE= "//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}LE)'"
|
||||
BATCH_LIBICULX= "//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}LX)'"
|
||||
endif
|
||||
@ -146,7 +146,7 @@ LIBICULE= $(LIBDIR)/$(LIBICU)le$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
||||
LIBICULX= $(LIBDIR)/$(LIBICU)lx$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
||||
LIBCTESTFW= $(top_builddir)/tools/ctestfw/$(LIBICU)ctestfw$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
||||
LIBICUTOOLUTIL= $(LIBDIR)/$(LIBICU)tu$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
||||
LIBUSTDIO= $(LIBDIR)/$(LIBICU)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
||||
LIBICUIO= $(LIBDIR)/$(LIBICU)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
|
||||
|
||||
## Special 390 rules
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
## Copyright (c) 1999-2004, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-os400,v 1.25 2004/03/26 01:22:25 grhoten-oss Exp $
|
||||
## $Id: mh-os400,v 1.26 2004/04/01 00:21:57 grhoten-oss Exp $
|
||||
|
||||
GEN_DEPS.c= $(CC1) -E -M $(DEFS) $(CPPFLAGS)
|
||||
GEN_DEPS.cc= $(CXX1) -E -M $(DEFS) $(CPPFLAGS)
|
||||
@ -56,7 +56,7 @@ LIBICULE = $(LIBDIR)/$(LIBICU)le$(ICULIBSUFFIX).$(SO)
|
||||
LIBICULX = $(LIBDIR)/$(LIBICU)lx$(ICULIBSUFFIX).$(SO)
|
||||
LIBCTESTFW = $(top_builddir)/tools/ctestfw/$(LIBICU)ctestfw$(ICULIBSUFFIX).$(SO)
|
||||
LIBICUTOOLUTIL = $(LIBDIR)/$(LIBICU)tu$(ICULIBSUFFIX).$(SO)
|
||||
LIBUSTDIO= $(LIBDIR)/$(LIBICU)io$(ICULIBSUFFIX).$(SO)
|
||||
LIBICUIO= $(LIBDIR)/$(LIBICU)io$(ICULIBSUFFIX).$(SO)
|
||||
|
||||
## Special OS400 rules
|
||||
|
||||
|
||||
397
icu4c/source/configure
vendored
397
icu4c/source/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2003, International Business Machines Corporation and
|
||||
dnl others. All Rights Reserved.
|
||||
dnl Stephen F. Booth, heavily modified by Yves and others
|
||||
|
||||
dnl $Id: configure.in,v 1.206 2004/03/09 02:20:05 grhoten-oss Exp $
|
||||
dnl $Id: configure.in,v 1.207 2004/04/01 00:21:57 grhoten-oss Exp $
|
||||
|
||||
dnl Process this file with autoconf to produce a configure script
|
||||
AC_INIT(common/unicode/utypes.h)
|
||||
@ -54,7 +54,7 @@ if test "$srcdir" = "."; then
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true)
|
||||
#AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true)
|
||||
AC_CHECK_PROG(STRIP, strip, strip, true)
|
||||
|
||||
dnl Check for the platform make
|
||||
@ -667,11 +667,11 @@ if test $U_SIZEOF_WCHAR_T = 0; then
|
||||
fi
|
||||
AC_SUBST(U_SIZEOF_WCHAR_T)
|
||||
|
||||
dnl Echo
|
||||
ECHO_N=$ac_n
|
||||
ECHO_C=$ac_c
|
||||
AC_SUBST(ECHO_N)
|
||||
AC_SUBST(ECHO_C)
|
||||
#dnl Echo
|
||||
#ECHO_N=$ac_n
|
||||
#ECHO_C=$ac_c
|
||||
#AC_SUBST(ECHO_N)
|
||||
#AC_SUBST(ECHO_C)
|
||||
|
||||
dnl Enable/disable extras
|
||||
AC_ARG_ENABLE(extras,
|
||||
@ -684,14 +684,14 @@ AC_ARG_ENABLE(extras,
|
||||
extras=true)
|
||||
ICU_CONDITIONAL(EXTRAS, test "$extras" = true)
|
||||
AC_ARG_ENABLE(extras,
|
||||
[ --enable-ustdio build ICU's ustdio library [default=yes]],
|
||||
[ --enable-icuio build ICU's icuio library [default=yes]],
|
||||
[case "${enableval}" in
|
||||
yes) ustdio=true ;;
|
||||
no) ustdio=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-ustdio) ;;
|
||||
yes) icuio=true ;;
|
||||
no) icuio=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-icuio) ;;
|
||||
esac],
|
||||
ustdio=true)
|
||||
ICU_CONDITIONAL(USTDIO, test "$ustdio" = true)
|
||||
icuio=true)
|
||||
ICU_CONDITIONAL(ICUIO, test "$icuio" = true)
|
||||
|
||||
dnl Enable/disable layout
|
||||
AC_ARG_ENABLE(layout,
|
||||
|
||||
@ -45,7 +45,6 @@ INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM=@INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT=@INSTALL_SCRIPT@
|
||||
INSTALL_DATA=@INSTALL_DATA@
|
||||
AUTOCONF=@AUTOCONF@
|
||||
host=@host@
|
||||
host_alias=@host_alias@
|
||||
host_cpu=@host_cpu@
|
||||
@ -62,12 +61,6 @@ HAVE_UINT16_T=@HAVE_UINT16_T@
|
||||
HAVE_INT32_T=@HAVE_INT32_T@
|
||||
HAVE_UINT32_T=@HAVE_UINT32_T@
|
||||
HAVE_BOOL_T=@HAVE_BOOL_T@
|
||||
EXTRAS_TRUE=@EXTRAS_TRUE@
|
||||
EXTRAS_FALSE=@EXTRAS_FALSE@
|
||||
TESTS_TRUE=@TESTS_TRUE@
|
||||
TESTS_FALSE=@TESTS_FALSE@
|
||||
SAMPLES_TRUE=@SAMPLES_TRUE@
|
||||
SAMPLES_FALSE=@SAMPLES_FALSE@
|
||||
platform=@platform@
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#******************************************************************************
|
||||
#
|
||||
# Copyright (C) 1999, International Business Machines
|
||||
# Copyright (C) 1999-2004, International Business Machines
|
||||
# Corporation and others. All Rights Reserved.
|
||||
#
|
||||
#******************************************************************************
|
||||
@ -15,8 +15,7 @@ top_builddir = ..
|
||||
|
||||
include $(top_builddir)/icudefs.mk
|
||||
|
||||
@USTDIO_TRUE@USTDIO = ustdio
|
||||
@USTDIO_FALSE@USTDIO =
|
||||
@ICUIO_TRUE@ICUIO = ustdio
|
||||
|
||||
## Build directory information
|
||||
subdir = extra
|
||||
@ -24,7 +23,7 @@ subdir = extra
|
||||
## Files to remove for 'make clean'
|
||||
CLEANFILES = *~
|
||||
|
||||
SUBDIRS = $(USTDIO) uconv
|
||||
SUBDIRS = $(ICUIO) uconv
|
||||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local all-recursive install install-local \
|
||||
|
||||
@ -44,7 +44,6 @@ INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM=@INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT=@INSTALL_SCRIPT@
|
||||
INSTALL_DATA=@INSTALL_DATA@
|
||||
AUTOCONF=@AUTOCONF@
|
||||
host=@host@
|
||||
host_alias=@host_alias@
|
||||
host_cpu=@host_cpu@
|
||||
@ -61,12 +60,6 @@ HAVE_UINT16_T=@HAVE_UINT16_T@
|
||||
HAVE_INT32_T=@HAVE_INT32_T@
|
||||
HAVE_UINT32_T=@HAVE_UINT32_T@
|
||||
HAVE_BOOL_T=@HAVE_BOOL_T@
|
||||
EXTRAS_TRUE=@EXTRAS_TRUE@
|
||||
EXTRAS_FALSE=@EXTRAS_FALSE@
|
||||
TESTS_TRUE=@TESTS_TRUE@
|
||||
TESTS_FALSE=@TESTS_FALSE@
|
||||
SAMPLES_TRUE=@SAMPLES_TRUE@
|
||||
SAMPLES_FALSE=@SAMPLES_FALSE@
|
||||
platform=@platform@
|
||||
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ SO_VERSION_DATA = ustdio.res
|
||||
endif
|
||||
|
||||
ifeq ($(OS390BATCH),1)
|
||||
BATCH_TARGET = $(BATCH_USTDIO_TARGET)
|
||||
BATCH_TARGET = $(BATCH_ICUIO_TARGET)
|
||||
BATCH_LIBS = $(BATCH_LIBICUUC) $(BATCH_LIBICUI18N) -lm
|
||||
endif # OS390BATCH
|
||||
|
||||
|
||||
@ -125,8 +125,8 @@ ENABLE_SHARED = @ENABLE_SHARED@
|
||||
|
||||
# Echo w/o newline
|
||||
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_C = @ECHO_C@
|
||||
#ECHO_N = @ECHO_N@
|
||||
#ECHO_C = @ECHO_C@
|
||||
|
||||
# Commands to compile
|
||||
COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
|
||||
|
||||
3
icu4c/source/test/testdata/Makefile.in
vendored
3
icu4c/source/test/testdata/Makefile.in
vendored
@ -20,11 +20,8 @@ subdir = test/testdata
|
||||
|
||||
## Optional directory setup
|
||||
@EXTRAS_TRUE@EXTRA = extra
|
||||
@EXTRAS_FALSE@EXTRA =
|
||||
@TESTS_TRUE@TEST = test
|
||||
@TESTS_FALSE@TEST =
|
||||
@SAMPLES_TRUE@SAMPLE = samples
|
||||
@SAMPLES_FALSE@SAMPLE =
|
||||
|
||||
|
||||
## Files to remove for 'make clean'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user