ICU-620 cleaned up cleaning (w/ an ugly twist in the top-level Makefile to start cleaning w/ tools)

X-SVN-Rev: 2551
This commit is contained in:
Yves Arrouye 2000-10-02 23:37:16 +00:00
parent ce2a907f31
commit 9686d239f0
29 changed files with 182 additions and 173 deletions

View file

@ -71,7 +71,7 @@ EXTRA_DATA =
.PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \
install-recursive clean clean-local clean-recursive distclean \
distclean-local distclean-recursive doc dist dist-local dist-recursive \
check check-local check-recursive
check check-local check-recursive clean-recursive-with-twist
## Clear suffix list
.SUFFIXES :
@ -79,16 +79,19 @@ check check-local check-recursive
## List of standard targets
all: all-local all-recursive
install: install-recursive install-local
clean: clean-recursive clean-local
clean: clean-recursive-with-twist clean-local
distclean : distclean-recursive distclean-local
dist: dist-recursive dist-local
check: all check-recursive check-local
LOCAL_SUBDIRS = $(SUBDIRS)
CLEAN_FIRST_SUBDIRS = tools
## Recursive targets
all-recursive install-recursive clean-recursive distclean-recursive dist-recursive check-recursive:
@dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
list='$(LOCAL_SUBDIRS)'; for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@ -102,6 +105,9 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi
$(MAKE) "$$target-local" || exit; \
fi
clean-recursive-with-twist:
$(MAKE) clean-recursive LOCAL_SUBDIRS='$(CLEAN_FIRST_SUBDIRS) $(filter-out tools,$($(CLEAN_FIRST_SUBDIRS)))'
all-local: $(srcdir)/configure
install-local: $(top_builddir)/config/Makefile.inc $(EXTRA_DATA:%=$(DESTDIR)$(pkgdatadir)/$(VERSION)/%)

View file

@ -49,7 +49,7 @@ top_builddir = ..
subdir = common
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
@ -139,7 +139,7 @@ clean-local:
$(RMV) $(OBJECTS) $(ALL_TARGETS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local:

210
icu4c/source/configure vendored
View file

@ -1417,12 +1417,6 @@ else
fi
if test x$ENABLE_SHARED = xYES
then
CPPFLAGS="$CPPFLAGS \$(PICCPPFLAGS)"
CFLAGS="$CFLAGS \$(PICFLAGS)"
CXXFLAGS="$CXXFLAGS \$(PICFLAGS)"
fi
# Check whether --enable-static or --disable-static was given.
if test "${enable_static+set}" = set; then
@ -1439,7 +1433,7 @@ fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1443: checking for $ac_word" >&5
echo "configure:1437: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1496,7 +1490,7 @@ ICU_USE_THREADS=0
if test $hpuxcma = true; then
if test $threads = true; then
echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6
echo "configure:1500: checking for pthread_create in -lcma" >&5
echo "configure:1494: checking for pthread_create in -lcma" >&5
ac_lib_var=`echo cma'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1504,7 +1498,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcma $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1508 "configure"
#line 1502 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -1515,7 +1509,7 @@ int main() {
pthread_create()
; return 0; }
EOF
if { (eval echo configure:1519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1550,7 +1544,7 @@ else
if test $threads = true; then
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
echo "configure:1554: checking for pthread_create in -lpthread" >&5
echo "configure:1548: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1558,7 +1552,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1562 "configure"
#line 1556 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -1569,7 +1563,7 @@ int main() {
pthread_create()
; return 0; }
EOF
if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1601,7 +1595,7 @@ fi
ICU_USE_THREADS=1
else
echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
echo "configure:1605: checking for pthread_mutex_init in -lpthread" >&5
echo "configure:1599: checking for pthread_mutex_init in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1609,7 +1603,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1613 "configure"
#line 1607 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -1620,7 +1614,7 @@ int main() {
pthread_mutex_init()
; return 0; }
EOF
if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1655,7 +1649,7 @@ fi
if test $ICU_USE_THREADS = 0; then
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
echo "configure:1659: checking for pthread_create in -lpthreads" >&5
echo "configure:1653: checking for pthread_create in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1663,7 +1657,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthreads $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1667 "configure"
#line 1661 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -1674,7 +1668,7 @@ int main() {
pthread_create()
; return 0; }
EOF
if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1708,7 +1702,7 @@ fi
if test $ICU_USE_THREADS = 0; then
echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6
echo "configure:1712: checking for pthread_create in -lcma" >&5
echo "configure:1706: checking for pthread_create in -lcma" >&5
ac_lib_var=`echo cma'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1716,7 +1710,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcma $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1720 "configure"
#line 1714 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -1727,7 +1721,7 @@ int main() {
pthread_create()
; return 0; }
EOF
if { (eval echo configure:1731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1761,14 +1755,14 @@ fi
if test $ICU_USE_THREADS = 0; then
echo $ac_n "checking if we need -pthread for threads""... $ac_c" 1>&6
echo "configure:1765: checking if we need -pthread for threads" >&5
echo "configure:1759: checking if we need -pthread for threads" >&5
if eval "test \"`echo '$''{'ac_ldflag_pthread'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LDFLAGS="$LDFLAGS"
LDFLAGS="-pthread $LDFLAGS"
cat > conftest.$ac_ext <<EOF
#line 1772 "configure"
#line 1766 "configure"
#include "confdefs.h"
char pthread_create();
@ -1777,7 +1771,7 @@ int main() {
pthread_create();
; return 0; }
EOF
if { (eval echo configure:1781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_ldflag_pthread=yes"
else
@ -1800,12 +1794,12 @@ fi
fi
echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6
echo "configure:1804: checking for pthread_mutex_lock" >&5
echo "configure:1798: checking for pthread_mutex_lock" >&5
if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1809 "configure"
#line 1803 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_mutex_lock(); below. */
@ -1828,7 +1822,7 @@ pthread_mutex_lock();
; return 0; }
EOF
if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pthread_mutex_lock=yes"
else
@ -1858,7 +1852,7 @@ fi
echo $ac_n "checking for wcscpy in -lwcs""... $ac_c" 1>&6
echo "configure:1862: checking for wcscpy in -lwcs" >&5
echo "configure:1856: checking for wcscpy in -lwcs" >&5
ac_lib_var=`echo wcs'_'wcscpy | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1866,7 +1860,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lwcs $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1870 "configure"
#line 1864 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -1877,7 +1871,7 @@ int main() {
wcscpy()
; return 0; }
EOF
if { (eval echo configure:1881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1911,7 +1905,7 @@ HAVE_DLOPEN=0
#add more libs here..
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:1915: checking for dlopen in -ldl" >&5
echo "configure:1909: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1919,7 +1913,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1923 "configure"
#line 1917 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -1930,7 +1924,7 @@ int main() {
dlopen()
; return 0; }
EOF
if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1964,7 +1958,7 @@ fi
if test $HAVE_DLOPEN = 0; then
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
echo "configure:1968: checking for shl_load in -ldld" >&5
echo "configure:1962: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1972,7 +1966,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1976 "configure"
#line 1970 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -1983,7 +1977,7 @@ int main() {
shl_load()
; return 0; }
EOF
if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -2019,12 +2013,12 @@ fi
if test $HAVE_DLOPEN = 0; then
echo $ac_n "checking for dllload""... $ac_c" 1>&6
echo "configure:2023: checking for dllload" >&5
echo "configure:2017: checking for dllload" >&5
if eval "test \"`echo '$''{'ac_cv_func_dllload'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2028 "configure"
#line 2022 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dllload(); below. */
@ -2047,7 +2041,7 @@ dllload();
; return 0; }
EOF
if { (eval echo configure:2051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dllload=yes"
else
@ -2074,7 +2068,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:2078: checking how to run the C preprocessor" >&5
echo "configure:2072: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@ -2089,13 +2083,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
#line 2093 "configure"
#line 2087 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@ -2106,13 +2100,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
#line 2110 "configure"
#line 2104 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@ -2123,13 +2117,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
#line 2127 "configure"
#line 2121 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@ -2157,17 +2151,17 @@ for ac_hdr in unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2161: checking for $ac_hdr" >&5
echo "configure:2155: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2166 "configure"
#line 2160 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@ -2196,12 +2190,12 @@ done
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:2200: checking for $ac_func" >&5
echo "configure:2194: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2205 "configure"
#line 2199 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@ -2224,7 +2218,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@ -2249,7 +2243,7 @@ fi
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
echo "configure:2253: checking for working mmap" >&5
echo "configure:2247: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -2257,7 +2251,7 @@ else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
#line 2261 "configure"
#line 2255 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@ -2400,7 +2394,7 @@ main()
}
EOF
if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_mmap_fixed_mapped=yes
else
@ -2431,17 +2425,17 @@ for ac_hdr in inttypes.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2435: checking for $ac_hdr" >&5
echo "configure:2429: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2440 "configure"
#line 2434 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@ -2501,7 +2495,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
U_IOSTREAM_SOURCE=0
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
echo "configure:2505: checking how to run the C++ preprocessor" >&5
echo "configure:2499: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -2514,12 +2508,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
#line 2518 "configure"
#line 2512 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@ -2545,17 +2539,17 @@ echo "$ac_t""$CXXCPP" 1>&6
ac_safe=`echo "iostream" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for iostream""... $ac_c" 1>&6
echo "configure:2549: checking for iostream" >&5
echo "configure:2543: checking for iostream" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2554 "configure"
#line 2548 "configure"
#include "confdefs.h"
#include <iostream>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@ -2582,17 +2576,17 @@ fi
else
ac_safe=`echo "iostream.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for iostream.h""... $ac_c" 1>&6
echo "configure:2586: checking for iostream.h" >&5
echo "configure:2580: checking for iostream.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2591 "configure"
#line 2585 "configure"
#include "confdefs.h"
#include <iostream.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@ -2615,19 +2609,19 @@ fi
if test $ac_cv_header_iostream_h = yes; then
echo $ac_n "checking whether ostream is really defined""... $ac_c" 1>&6
echo "configure:2619: checking whether ostream is really defined" >&5
echo "configure:2613: checking whether ostream is really defined" >&5
if eval "test \"`echo '$''{'ac_cv_iostream_ok'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2624 "configure"
#line 2618 "configure"
#include "confdefs.h"
#include <iostream.h>
int main() {
ostream &testout = cout; testout << "test" << endl;
; return 0; }
EOF
if { (eval echo configure:2631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_iostream_ok=yes
else
@ -2666,14 +2660,14 @@ cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
echo "configure:2670: checking whether byte ordering is bigendian" >&5
echo "configure:2664: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
#line 2677 "configure"
#line 2671 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@ -2684,11 +2678,11 @@ int main() {
#endif
; return 0; }
EOF
if { (eval echo configure:2688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
#line 2692 "configure"
#line 2686 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@ -2699,7 +2693,7 @@ int main() {
#endif
; return 0; }
EOF
if { (eval echo configure:2703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@ -2719,7 +2713,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
#line 2723 "configure"
#line 2717 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@ -2732,7 +2726,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
if { (eval echo configure:2736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
@ -2764,17 +2758,17 @@ fi
ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
echo "configure:2768: checking for wchar.h" >&5
echo "configure:2762: checking for wchar.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2773 "configure"
#line 2767 "configure"
#include "confdefs.h"
#include <wchar.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@ -2809,7 +2803,7 @@ fi
ac_default_sizeof_wchar_t=4
echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
echo "configure:2813: checking size of wchar_t" >&5
echo "configure:2807: checking size of wchar_t" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -2817,7 +2811,7 @@ else
ac_cv_sizeof_wchar_t=$ac_default_sizeof_wchar_t
else
cat > conftest.$ac_ext <<EOF
#line 2821 "configure"
#line 2815 "configure"
#include "confdefs.h"
#if STDC_HEADERS
#include <stddef.h>
@ -2834,7 +2828,7 @@ main()
exit(0);
}
EOF
if { (eval echo configure:2838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_wchar_t=`cat conftestval`
else
@ -2857,12 +2851,12 @@ U_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:2861: checking for ANSI C header files" >&5
echo "configure:2855: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2866 "configure"
#line 2860 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@ -2870,7 +2864,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@ -2887,7 +2881,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 2891 "configure"
#line 2885 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@ -2905,7 +2899,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 2909 "configure"
#line 2903 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@ -2926,7 +2920,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
#line 2930 "configure"
#line 2924 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@ -2937,7 +2931,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
if { (eval echo configure:2941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@ -2961,12 +2955,12 @@ EOF
fi
echo $ac_n "checking for int8_t""... $ac_c" 1>&6
echo "configure:2965: checking for int8_t" >&5
echo "configure:2959: checking for int8_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_int8_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2970 "configure"
#line 2964 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -2994,12 +2988,12 @@ EOF
fi
echo $ac_n "checking for uint8_t""... $ac_c" 1>&6
echo "configure:2998: checking for uint8_t" >&5
echo "configure:2992: checking for uint8_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3003 "configure"
#line 2997 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -3027,12 +3021,12 @@ EOF
fi
echo $ac_n "checking for int16_t""... $ac_c" 1>&6
echo "configure:3031: checking for int16_t" >&5
echo "configure:3025: checking for int16_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3036 "configure"
#line 3030 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -3060,12 +3054,12 @@ EOF
fi
echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
echo "configure:3064: checking for uint16_t" >&5
echo "configure:3058: checking for uint16_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3069 "configure"
#line 3063 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -3093,12 +3087,12 @@ EOF
fi
echo $ac_n "checking for int32_t""... $ac_c" 1>&6
echo "configure:3097: checking for int32_t" >&5
echo "configure:3091: checking for int32_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3102 "configure"
#line 3096 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -3126,12 +3120,12 @@ EOF
fi
echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
echo "configure:3130: checking for uint32_t" >&5
echo "configure:3124: checking for uint32_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3135 "configure"
#line 3129 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -3159,12 +3153,12 @@ EOF
fi
echo $ac_n "checking for bool_t""... $ac_c" 1>&6
echo "configure:3163: checking for bool_t" >&5
echo "configure:3157: checking for bool_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_bool_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3168 "configure"
#line 3162 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -3437,6 +3431,12 @@ if test $hpuxcma = true; then
CPPFLAGS="${CPPFLAGS} -D_PTHREADS_DRAFT_4 -DHPUX_CMA"
fi
if test x$ENABLE_SHARED = xYES
then
CPPFLAGS="$CPPFLAGS \$(PICCPPFLAGS)"
CFLAGS="$CFLAGS \$(PICFLAGS)"
CXXFLAGS="$CXXFLAGS \$(PICFLAGS)"
fi
if test "$ac_cv_lib_dld_shl_load" = "yes"; then
CPPFLAGS="${CPPFLAGS} -DICU_USE_SHL_LOAD"

View file

@ -109,12 +109,6 @@ AC_ARG_ENABLE(shared,
[ENABLE_SHARED=YES]
)
AC_SUBST(ENABLE_SHARED)
if test x$ENABLE_SHARED = xYES
then
CPPFLAGS="$CPPFLAGS \$(PICCPPFLAGS)"
CFLAGS="$CFLAGS \$(PICFLAGS)"
CXXFLAGS="$CXXFLAGS \$(PICFLAGS)"
fi
dnl Check whether to build static libraries
AC_ARG_ENABLE(static,
@ -553,6 +547,14 @@ if test $hpuxcma = true; then
fi
dnl END special
dnl Now that we're done using CPPFLAGS etc. for tests, we can change it
dnl for build.
if test x$ENABLE_SHARED = xYES
then
CPPFLAGS="$CPPFLAGS \$(PICCPPFLAGS)"
CFLAGS="$CFLAGS \$(PICFLAGS)"
CXXFLAGS="$CXXFLAGS \$(PICFLAGS)"
fi
if test "$ac_cv_lib_dld_shl_load" = "yes"; then
CPPFLAGS="${CPPFLAGS} -DICU_USE_SHL_LOAD"

View file

@ -123,13 +123,13 @@ dist-local:
clean-local:
test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
distclean-local: clean-local
$(RMV) Makefile
ifneq ($(wildcard .links),)
$(RMV) UnicodeData-$(UNICODE_VERSION).txt thaidict.brk unidata .links
endif
distclean-local: clean-local
$(RMV) Makefile
check-local:
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

View file

@ -49,7 +49,7 @@ top_builddir = ../..
subdir = extra/ustdio
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
@ -130,7 +130,7 @@ clean-local:
$(RMV) $(OBJECTS) $(ALL_TARGETS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local:

View file

@ -43,7 +43,7 @@ top_builddir = ..
subdir = i18n
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
@ -132,7 +132,7 @@ clean-local:
$(RMV) $(OBJECTS) $(ALL_TARGETS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local:

View file

@ -41,7 +41,7 @@ VERSION = @VERSION@
top_builddir = ../..
subdir = samples/XMLConverter
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
TARGET = XMLConverter
@ -87,7 +87,7 @@ clean-local:
$(RMV) $(OBJECTS) $(TARGET)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local:

View file

@ -42,7 +42,7 @@ top_builddir = ../..
subdir = samples/cal
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
TARGET = cal
@ -93,7 +93,7 @@ clean-local:
$(RMV) $(OBJECTS) $(TARGET)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local:

View file

@ -42,7 +42,7 @@ top_builddir = ../..
subdir = samples/date
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
TARGET = date
@ -93,7 +93,7 @@ clean-local:
$(RMV) $(OBJECTS) $(TARGET)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local:

View file

@ -45,7 +45,7 @@ top_builddir = ../..
subdir = test/cintltst
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
TARGET = cintltst
@ -111,7 +111,7 @@ clean-local:
$(RMV) $(OBJECTS) $(TARGET)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local: all-local
ICU_DATA=$(top_builddir)/data/ TZ=PST8PDT ./$(TARGET)

View file

@ -42,7 +42,7 @@ top_builddir = ../..
subdir = test/ieeetest
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
TARGET = ieeetest
@ -84,7 +84,7 @@ clean-local:
$(RMV) $(OBJECTS) $(TARGET)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local: all-local
- ICU_DATA=$(top_srcdir)/../data/ ./$(TARGET)

View file

@ -42,7 +42,7 @@ top_builddir = ../..
subdir = test/intltest
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
TARGET = intltest
@ -96,7 +96,7 @@ clean-local:
$(RMV) $(OBJECTS) $(TARGET)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local: all-local
ICU_DATA=$(top_builddir)/data/ TZ=PST8PDT ./$(TARGET)

View file

@ -123,13 +123,13 @@ dist-local:
clean-local:
test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
distclean-local: clean-local
$(RMV) Makefile
ifneq ($(wildcard .links),)
$(RMV) *.goo *.txt *.bin *.uni .links
endif
distclean-local: clean-local
$(RMV) Makefile
check-local:
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

View file

@ -45,7 +45,7 @@ top_builddir = ../..
subdir = test/testmap
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
TARGET = testmap
@ -99,7 +99,7 @@ clean-local:
$(RMV) $(OBJECTS) $(TARGET)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local: all-local
ICU_DATA=NOTHING ./$(TARGET)

View file

@ -161,11 +161,8 @@ install-local: all-local install-udata
dist-local:
clean-local: clean-pkgdata
test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) $(TMPDATADIR)/*
# Clean up any old variations..
distclean-local: clean-local
$(RMV) Makefile $(SRCDATAFILES) $(DATAFILES) $(TESTDATAD) $(BASETESTDATA) icupkg.inc
test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
$(RMV) $(SRCDATAFILES) $(DATAFILES) icupkg.inc
-@if [ -f $(TMPDATADIR)/icudata_dll.mak ]; then \
(cd pkgdata ; ./pkgdata -T $(TMPDATADIR) -m dll -p icudata -O $(DATABUILDDIR)/icupkg.inc $(TMPDATADIR)/icudata.lst -d $(DATABUILDDIR) --clean ) \
fi
@ -174,6 +171,10 @@ distclean-local: clean-local
fi
-@$(RMV) $(TMPDATADIR)
# Clean up any old variations..
distclean-local: clean-local
$(RMV) Makefile
$(TMPDATADIR)/icudata.lst: Makefile $(srcdir)/Makefile.in $(srcdir)/genrb/genrbfiles.mk $(srcdir)/makeconv/ucmfiles.mk
@echo Generating $@ list of data files
@$(mkinstalldirs) $(TMPDATADIR)
@ -217,4 +218,3 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View file

@ -44,7 +44,7 @@ top_builddir = ../..
subdir = tools/ctestfw
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
TARGET = libctestfw.$(SO)
@ -86,7 +86,7 @@ clean-local:
$(RMV) $(OBJECTS) $(TARGET)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local: all-local

View file

@ -43,7 +43,7 @@ top_builddir = ../..
subdir = tools/genccode
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES)
## Target information
TARGET = genccode
@ -90,7 +90,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -43,7 +43,7 @@ top_builddir = ../..
subdir = tools/gencmn
## Extra files to remove for 'make clean'
CLEANFILES = *~ mkmap.tmp
CLEANFILES = *~ mkmap.tmp $(DEPS) $(RES_FILES) $(TEST_FILES)
## Target information
TARGET = gencmn
@ -98,7 +98,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -57,7 +57,7 @@ top_builddir = ../..
subdir = tools/gencnval
## Extra files to remove for 'make clean'
CLEANFILES = *~ $(GENERATED_MAN_FILES)
CLEANFILES = *~ $(GENERATED_MAN_FILES) $(DEPS) $(RES_FILES) $(TEST_FILES)
## Target information
TARGET = gencnval
@ -111,7 +111,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -49,7 +49,7 @@ top_builddir = ../..
subdir = tools/gennames
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES)
## Target information
TARGET = gennames
@ -101,7 +101,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -48,7 +48,7 @@ top_builddir = ../..
subdir = tools/genprops
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES)
## Target information
TARGET = genprops
@ -99,7 +99,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -47,7 +47,7 @@ top_builddir = ../..
subdir = tools/genrb
## Extra files to remove for 'make clean'
CLEANFILES = *~ $(TARGET).$(SECTION)
CLEANFILES = *~ $(TARGET).$(SECTION) $(DEPS) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES)
## Target information
TARGET = genrb
@ -121,7 +121,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -48,7 +48,7 @@ top_builddir = ../..
subdir = tools/gentest
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES)
## Target information
TARGET = gentest
@ -65,6 +65,7 @@ OBJECTS = gentest.o
DEPS = $(OBJECTS:.o=.d)
TEST_FILES = $(ICUDATADIR)/test.dat
## List of phony targets
.PHONY : all all-local install install-local clean clean-local \
@ -88,7 +89,7 @@ install-local: all-local build-data
$(mkinstalldirs) $(DESTDIR)$(sbindir)
$(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET)
build-data: $(ICUDATADIR)/test.dat
build-data: $(TESTFILES)
# we set the ICU_DATA directory here so that test.dat ends up in
# icu/data rather than PREFIX/share/icu/VERSION/
@ -102,7 +103,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -48,7 +48,7 @@ top_builddir = ../..
subdir = tools/gentz
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES)
## Target information
TARGET = gentz
@ -102,7 +102,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -49,7 +49,7 @@ top_builddir = ../..
subdir = tools/makeconv
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS) $(CNV_FILES) $(TEST_CNV_FILES)
## Target information
TARGET = makeconv
@ -121,7 +121,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(CNV_FILES) $(TEST_CNV_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -43,7 +43,7 @@ top_builddir = ../..
subdir = tools/pkgdata
## Extra files to remove for 'make clean'
CLEANFILES = *~ mkmap.tmp
CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) icupkg.inc mkmap.tmp
## Target information
TARGET = pkgdata
@ -90,7 +90,7 @@ clean-local:
$(RMV) $(TARGET) $(OBJECTS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES) icupkg.inc
$(RMV) Makefile
check-local: all-local

View file

@ -41,7 +41,7 @@ top_builddir = ../..
subdir = tools/rbdump
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS) $(CNV_FILES)
## Target information
TARGET = rbdump
@ -86,7 +86,7 @@ clean-local:
$(RMV) $(OBJECTS) $(TARGET)
distclean-local: clean-local
$(RMV) Makefile $(DEPS) $(CNV_FILES)
$(RMV) Makefile
check-local: all-local

View file

@ -43,7 +43,7 @@ top_builddir = ../..
subdir = tools/toolutil
## Extra files to remove for 'make clean'
CLEANFILES = *~
CLEANFILES = *~ $(DEPS)
## Target information
@ -113,7 +113,7 @@ clean-local:
$(RMV) $(OBJECTS) $(ALL_TARGETS)
distclean-local: clean-local
$(RMV) Makefile $(DEPS)
$(RMV) Makefile
check-local: all-local