ICU-360 pkgtools, out of source test update,fix 'make install' on solaris
X-SVN-Rev: 2254
This commit is contained in:
parent
cb0fd7d837
commit
8fa7d2d25a
@ -104,6 +104,8 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi
|
||||
all-local: $(srcdir)/configure builddata
|
||||
|
||||
install-local: $(top_builddir)/config/Makefile.inc $(EXTRA_DATA:%=$(DESTDIR)$(pkgdatadir)/$(VERSION)/%)
|
||||
@$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
||||
@$(mkinstalldirs) $(DESTDIR)$(sbindir)
|
||||
$(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkgdatadir)/Makefile.inc
|
||||
$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)/mkinstalldirs
|
||||
|
||||
@ -155,11 +157,12 @@ config.status: $(srcdir)/configure
|
||||
builddata: @DATABUILDDIR@/UnicodeData-$(UNICODE_VERSION).txt @DATABUILDDIR@/thaidict.brk @DATABUILDDIR@/../source/test/testdata/default.goo
|
||||
|
||||
@DATABUILDDIR@/UnicodeData-$(UNICODE_VERSION).txt: $(srcdir)/../data/UnicodeData-$(UNICODE_VERSION).txt
|
||||
ln -s `pwd`/$< @DATABUILDDIR@
|
||||
ln -sf $< @DATABUILDDIR@
|
||||
|
||||
@DATABUILDDIR@/thaidict.brk: $(srcdir)/../data/thaidict.brk
|
||||
ln -s `pwd`/$< @DATABUILDDIR@
|
||||
ln -sf $< @DATABUILDDIR@
|
||||
|
||||
@DATABUILDDIR@/../source/test/testdata/default.goo: $(srcdir)/test/testdata/default.goo
|
||||
ln -s `pwd`/$(srcdir)/test/testdata/*.goo `pwd`/$(srcdir)/test/testdata/*.txt `pwd`/$(srcdir)/test/testdata/*.bin `pwd`/$(srcdir)/test/testdata/*.uni @DATABUILDDIR@/../source/test/testdata/
|
||||
ln -sf $(srcdir)/test/testdata/*.goo $(srcdir)/test/testdata/*.txt $(srcdir)/test/testdata/*.bin $(srcdir)/test/testdata/*.uni @DATABUILDDIR@/../source/test/testdata/
|
||||
ln -sf $(srcdir)/../data/unidata @DATABUILDDIR@
|
||||
|
||||
|
@ -4,10 +4,10 @@
|
||||
## others. All Rights Reserved.
|
||||
|
||||
|
||||
## This causes source/tools/Makefile.in to create and link in a
|
||||
## bogus C++ file, so that exception handling with +eh will be
|
||||
## enabled properly.
|
||||
HPUX_JUNK_OBJ= hpux_junk_obj.o
|
||||
## This causes source/tools/pkgdata generated makefiles to create and link
|
||||
## in a bogus C++ file, so that exception handling with +eh will be
|
||||
## enabled properly. Fun.
|
||||
HPUX_JUNK_OBJ= $(TEMP_DIR)/hpux_junk_obj.o
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= :
|
||||
|
4
icu4c/source/configure
vendored
4
icu4c/source/configure
vendored
@ -3142,7 +3142,7 @@ trap 'rm -fr `echo "Makefile \
|
||||
extra/Makefile extra/ustdio/Makefile \
|
||||
tools/Makefile tools/ctestfw/Makefile tools/makeconv/Makefile \
|
||||
tools/genrb/Makefile \
|
||||
tools/pkgdata/Makefile tools/icupkg.inc \
|
||||
tools/pkgdata/Makefile tools/pkgdata/icupkg.inc \
|
||||
tools/rbdump/Makefile tools/genccode/Makefile tools/gencmn/Makefile tools/gencnval/Makefile tools/gentz/Makefile \
|
||||
tools/gennames/Makefile tools/toolutil/Makefile tools/gentest/Makefile tools/genprops/Makefile \
|
||||
test/Makefile test/intltest/Makefile test/cintltst/Makefile \
|
||||
@ -3278,7 +3278,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile \
|
||||
extra/Makefile extra/ustdio/Makefile \
|
||||
tools/Makefile tools/ctestfw/Makefile tools/makeconv/Makefile \
|
||||
tools/genrb/Makefile \
|
||||
tools/pkgdata/Makefile tools/icupkg.inc \
|
||||
tools/pkgdata/Makefile tools/pkgdata/icupkg.inc \
|
||||
tools/rbdump/Makefile tools/genccode/Makefile tools/gencmn/Makefile tools/gencnval/Makefile tools/gentz/Makefile \
|
||||
tools/gennames/Makefile tools/toolutil/Makefile tools/gentest/Makefile tools/genprops/Makefile \
|
||||
test/Makefile test/intltest/Makefile test/cintltst/Makefile \
|
||||
|
@ -409,13 +409,14 @@ dnl On HP/UX, main() functions compiled in C don't invoke
|
||||
dnl static constructors in C++ libs. Hack around that here
|
||||
dnl by renaming some .c files to .cpp
|
||||
case "${host}" in
|
||||
*-*-hpux*)
|
||||
*-*-hpux10*)
|
||||
for file in samples/date/date \
|
||||
samples/cal/cal test/cintltst/cintltst \
|
||||
tools/makeconv/makeconv tools/genrb/genrb \
|
||||
tools/rbdump/read tools/genccode/genccode \
|
||||
tools/gencmn/gencmn tools/gencnval/gencnval \
|
||||
tools/gennames/gennames tools/gentest/gentest
|
||||
tools/gennames/gennames tools/gentest/gentest \
|
||||
tools/pkgdata/pkgdata
|
||||
do
|
||||
if test -f $file.c; then
|
||||
mv $file.c $file.cpp
|
||||
@ -467,7 +468,7 @@ AC_OUTPUT([Makefile \
|
||||
extra/Makefile extra/ustdio/Makefile \
|
||||
tools/Makefile tools/ctestfw/Makefile tools/makeconv/Makefile \
|
||||
tools/genrb/Makefile \
|
||||
tools/pkgdata/Makefile tools/icupkg.inc \
|
||||
tools/pkgdata/Makefile tools/pkgdata/icupkg.inc \
|
||||
tools/rbdump/Makefile tools/genccode/Makefile tools/gencmn/Makefile tools/gencnval/Makefile tools/gentz/Makefile \
|
||||
tools/gennames/Makefile tools/toolutil/Makefile tools/gentest/Makefile tools/genprops/Makefile \
|
||||
test/Makefile test/intltest/Makefile test/cintltst/Makefile \
|
||||
|
@ -9,9 +9,13 @@
|
||||
|
||||
PLATFORM=@platform@
|
||||
|
||||
top_srcdir=@top_srcdir@
|
||||
srcdir=@srcdir@
|
||||
top_builddir=../..
|
||||
|
||||
SHELL=@SHELL@
|
||||
CFLAGS=@CFLAGS@
|
||||
CPPFLAGS=@CPPFLAGS@ -I../../../source/common
|
||||
CPPFLAGS=@CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common
|
||||
CXXFLAGS=@CXXFLAGS@
|
||||
FFLAGS=@FFLAGS@
|
||||
DEFS=@DEFS@
|
||||
@ -79,13 +83,15 @@ ld_rpath_suf=@ld_rpath_suf@
|
||||
@host_frag@
|
||||
# end host fragment
|
||||
|
||||
top_builddir = ../..
|
||||
subdir = tools/tmp
|
||||
|
||||
##### Add the following to source/config/Makefile.in
|
||||
|
||||
GENCCODE=../genccode/genccode
|
||||
GENCMN=../gencmn/gencmn
|
||||
GENCCODE=$(top_builddir)/tools/genccode/genccode
|
||||
GENCMN=$(top_builddir)/tools/gencmn/gencmn
|
||||
|
||||
LPATHS=../../source/common:../../source/i18n:../../source/tools/toolutil
|
||||
#LPATHS=../source/common:../source/i18n:../source/tools/toolutil
|
||||
LPATHS=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil
|
||||
|
||||
TOOL=env LD_LIBRARY_PATH=$(LPATHS) LIBPATH=$(LPATHS)
|
||||
|
112
icu4c/source/extra/uconv/pkgdata.inc.in
Normal file
112
icu4c/source/extra/uconv/pkgdata.inc.in
Normal file
@ -0,0 +1,112 @@
|
||||
#******************************************************************************
|
||||
#
|
||||
# Copyright (C) 2000, International Business Machines
|
||||
# Corporation and others. All Rights Reserved.
|
||||
#
|
||||
#******************************************************************************
|
||||
# This Makefile is used to build the ICU's data.
|
||||
# It is included with the -O option to pkgdata.
|
||||
|
||||
PLATFORM=@platform@
|
||||
|
||||
top_srcdir=@top_srcdir@
|
||||
srcdir=@srcdir@
|
||||
top_builddir=../..
|
||||
|
||||
SHELL=@SHELL@
|
||||
CFLAGS=@CFLAGS@
|
||||
CPPFLAGS=@CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common
|
||||
CXXFLAGS=@CXXFLAGS@
|
||||
FFLAGS=@FFLAGS@
|
||||
DEFS=@DEFS@
|
||||
# We're not linking anything with ICU libs
|
||||
#LDFLAGS=@LDFLAGS@ -L$(prefix)/lib $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
|
||||
LIBS=@LIBS@
|
||||
ICULIBS=$(LIBS) -licu-uc -licu-i18n
|
||||
exec_prefix=@exec_prefix@
|
||||
prefix=@prefix@
|
||||
program_transform_name=@program_transform_name@
|
||||
bindir=@bindir@
|
||||
sbindir=@sbindir@
|
||||
libexecdir=@libexecdir@
|
||||
datadir=@datadir@
|
||||
sysconfdir=@sysconfdir@
|
||||
sharedstatedir=@sharedstatedir@
|
||||
localstatedir=@localstatedir@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
oldincludedir=@oldincludedir@
|
||||
infodir=@infodir@
|
||||
mandir=@mandir@
|
||||
PACKAGE=@PACKAGE@
|
||||
VERSION=@VERSION@
|
||||
CC=@CC@
|
||||
CXX=@CXX@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
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@
|
||||
host_vendor=@host_vendor@
|
||||
host_os=@host_os@
|
||||
LIB_M=@LIB_M@
|
||||
CPP=@CPP@
|
||||
U_HAVE_INTTYPES_H=@U_HAVE_INTTYPES_H@
|
||||
U_IS_BIG_ENDIAN=@U_IS_BIG_ENDIAN@
|
||||
HAVE_INT8_T=@HAVE_INT8_T@
|
||||
HAVE_UINT8_T=@HAVE_UINT8_T@
|
||||
HAVE_INT16_T=@HAVE_INT16_T@
|
||||
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@
|
||||
|
||||
|
||||
ld_rpath_suf=@ld_rpath_suf@
|
||||
|
||||
|
||||
# begin host fragment
|
||||
@host_frag@
|
||||
# end host fragment
|
||||
|
||||
top_builddir = ../..
|
||||
subdir = tools/tmp
|
||||
|
||||
##### Add the following to source/config/Makefile.in
|
||||
|
||||
GENCCODE=$(top_builddir)/tools/genccode/genccode
|
||||
GENCMN=$(top_builddir)/tools/gencmn/gencmn
|
||||
|
||||
LPATHS=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil
|
||||
|
||||
TOOL=env LD_LIBRARY_PATH=$(LPATHS) LIBPATH=$(LPATHS)
|
||||
|
||||
ifeq ($(strip $(PLATFORM)),OS390)
|
||||
TOOL=
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(PLATFORM)),AIX)
|
||||
TOOL=env LIBPATH=$(LPATHS)
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(PLATFORM)),HPUX)
|
||||
TOOL=env LD_LIBRARY_PATH=$(LPATHS)
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(PLATFORM)),U_LINUX)
|
||||
TOOL=env LD_LIBRARY_PATH=$(LPATHS)
|
||||
endif
|
@ -54,9 +54,10 @@ ICUDATADIR=$(pkgdatadir)/$(VERSION)
|
||||
SRCDATADIR=$(top_srcdir)/../data
|
||||
OBJDATADIR=$(top_builddir)/@RELATIVEDATADIR@
|
||||
# tmpdir is INSIDE pkgdata dir
|
||||
TMPDATADIR=./pkgdata/tmp
|
||||
TMPDATADIR=./tmp
|
||||
|
||||
PKGDATA=./pkgdata -T ./tmp -s @DATABUILDDIR@ -O @DATABUILDDIR@/icupkg.inc -d @DATABUILDDIR@ -v -m $(MODE)
|
||||
# relative lib links from pkgdata are the same as for tmp
|
||||
PKGDATA=../pkgdata/pkgdata -T . -s @DATABUILDDIR@ -O ./icupkg.inc -d @DATABUILDDIR@ -v -m $(MODE)
|
||||
|
||||
## Install program information
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
@ -152,8 +153,7 @@ DATAFILESR=$(RES_FILES)
|
||||
DATAFILES=$(DATAFILESD) $(DATAFILESC) $(DATAFILESB) $(DATAFILESR)
|
||||
|
||||
## Files to remove for 'make clean'
|
||||
CLEANFILES = *~ $(BRK_FILES) ./pkgdata/tmp/
|
||||
|
||||
CLEANFILES = *~ $(BRK_FILES)
|
||||
|
||||
install-udata: install-pkgdata
|
||||
|
||||
@ -162,56 +162,56 @@ install-local: all-local install-udata
|
||||
dist-local:
|
||||
|
||||
clean-local: clean-pkgdata
|
||||
test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
|
||||
test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) $(TMPDATADIR)/*
|
||||
|
||||
# Clean up any old variations..
|
||||
distclean-local: clean-local
|
||||
$(RMV) Makefile $(SRCDATAFILES) $(DATAFILES) $(TESTDATAD) $(BASETESTDATA) icupkg.inc
|
||||
-@if [ -f $(TMPDATADIR)/icudata_dll.mak ]; then \
|
||||
(cd pkgdata ; ./pkgdata -T ./tmp -m dll -p icudata -O @DATABUILDDIR@/icupkg.inc ./tmp/icudata.lst -d @DATABUILDDIR@ --clean ) \
|
||||
(cd pkgdata ; ./pkgdata -T $(TMPDATADIR) -m dll -p icudata -O @DATABUILDDIR@/icupkg.inc $(TMPDATADIR)/icudata.lst -d @DATABUILDDIR@ --clean ) \
|
||||
fi
|
||||
-@if [ -f $(TMPDATADIR)/icudata_common.mak ]; then \
|
||||
(cd pkgdata; ./pkgdata -T ./tmp -m common -p icudata -O @DATABUILDDIR@/icupkg.inc ./tmp/icudata.lst -d @DATABUILDDIR@ --clean ) \
|
||||
(cd pkgdata; ./pkgdata -T $(TMPDATADIR) -m common -p icudata -O @DATABUILDDIR@/icupkg.inc $(TMPDATADIR)/icudata.lst -d @DATABUILDDIR@ --clean ) \
|
||||
fi
|
||||
-@$(RMV) ./tmp/icudata.lst @DATABUILDDIR@/icupkg.inc @DATABUILDDIR@/*.o @DATABUILDDIR@/*.c @DATABUILDDIR@/*.mak @DATABUILDDIR@/*.lst
|
||||
-@$(RMV) $(TMPDATADIR)
|
||||
|
||||
@DATABUILDDIR@/icudata.lst: Makefile $(srcdir)/genrb/genrbfiles.mk
|
||||
$(TMPDATADIR)/icudata.lst: Makefile $(srcdir)/Makefile.in $(srcdir)/genrb/genrbfiles.mk $(srcdir)/makeconv/ucmfiles.mk
|
||||
@echo Generating $@ list of data files
|
||||
@-$(RMV) @DATABUILDDIR@/icudata.lst
|
||||
@-$(RMV) $(TMPDATADIR)/icudata.lst
|
||||
@for file in $(DATAFILES); do \
|
||||
echo `pwd`/$$file >>@DATABUILDDIR@/icudata.lst; \
|
||||
echo `pwd`/$$file >> $(TMPDATADIR)/icudata.lst; \
|
||||
done;
|
||||
|
||||
@DATABUILDDIR@/testdata.lst: Makefile
|
||||
$(TMPDATADIR)/testdata.lst: Makefile
|
||||
@$(mkinstalldirs) $(TMPDATADIR)
|
||||
@echo @DATABUILDDIR@/test.dat > $@
|
||||
|
||||
@DATABUILDDIR@/icupkg.inc: icupkg.inc
|
||||
cp icupkg.inc @DATABUILDDIR@/icupkg.inc
|
||||
$(TMPDATADIR)/icupkg.inc: pkgdata/icupkg.inc
|
||||
@$(mkinstalldirs) $(TMPDATADIR)
|
||||
cp pkgdata/icupkg.inc $(TMPDATADIR)/icupkg.inc
|
||||
|
||||
# build the ICU and test data
|
||||
|
||||
build-local build-pkgdata: @DATABUILDDIR@/icudata.lst @DATABUILDDIR@/testdata.lst @DATABUILDDIR@/icupkg.inc $(DATAFILES) @DATABUILDDIR@/test.dat
|
||||
$(mkinstalldirs) $(TMPDATADIR)
|
||||
(cd pkgdata; $(PKGDATA) -p icudata @DATABUILDDIR@/icudata.lst )
|
||||
(cd pkgdata; $(PKGDATA) -p base @DATABUILDDIR@/testdata.lst )
|
||||
(cd pkgdata; $(PKGDATA) -p base_test @DATABUILDDIR@/testdata.lst )
|
||||
|
||||
install-pkgdata: @DATABUILDDIR@/icudata.lst @DATABUILDDIR@/icupkg.inc
|
||||
$(mkinstalldirs) $(TMPDATADIR) $(DESTDIR)$(pkgdatadir)/$(VERSION)
|
||||
(cd pkgdata; $(PKGDATA) -p icudata @DATABUILDDIR@/icudata.lst -I $(DESTDIR)$(pkgdatadir)/$(VERSION) )
|
||||
|
||||
icupkg.inc: $(srcdir)/icupkg.inc.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
clean-pkgdata: @DATABUILDDIR@/icudata.lst @DATABUILDDIR@/icupkg.inc
|
||||
build-local build-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/testdata.lst $(TMPDATADIR)/icupkg.inc $(DATAFILES) @DATABUILDDIR@/test.dat
|
||||
@$(mkinstalldirs) $(TMPDATADIR)
|
||||
-@(cd pkgdata; $(PKGDATA) -p icudata @DATABUILDDIR@/icudata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' )
|
||||
-$(RMV) @DATABUILDDIR@/icudata.lst @DATABUILDDIR@/icupkg.inc
|
||||
(cd tmp; $(PKGDATA) -p icudata ./icudata.lst )
|
||||
(cd tmp; $(PKGDATA) -p base ./testdata.lst )
|
||||
(cd tmp; $(PKGDATA) -p base_test ./testdata.lst )
|
||||
|
||||
install-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/icupkg.inc
|
||||
$(mkinstalldirs) $(TMPDATADIR) $(DESTDIR)$(pkgdatadir)/$(VERSION)
|
||||
(cd tmp; $(PKGDATA) -p icudata ./icudata.lst -I $(DESTDIR)$(pkgdatadir)/$(VERSION) )
|
||||
|
||||
|
||||
clean-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/icupkg.inc
|
||||
@$(mkinstalldirs) $(TMPDATADIR)
|
||||
-@(cd tmp; $(PKGDATA) -p icudata ./icudata.lst --clean || echo '### Warning, cannot clean up icu/data if pkgdata is already gone.' )
|
||||
-$(RMV) $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/icupkg.inc
|
||||
|
||||
check-local:
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
|
||||
|
@ -121,7 +121,7 @@ $(TARGET) : $(OBJECTS)
|
||||
|
||||
@DATABUILDDIR@/../source/test/testdata/%.res : $(top_srcdir)/test/testdata/%.txt
|
||||
@echo "Creating testdata resource file for $<"
|
||||
@ICU_DATA=@DATABUILDDIR@ ./genrb -s @DATABUILDDIR@/../source/test/testdata/ -d @DATABUILDDIR@/../source/test/testdata/ $(<F)
|
||||
ICU_DATA=@DATABUILDDIR@ ./genrb -s $(top_srcdir)/test/testdata/ -d @DATABUILDDIR@../source/test/testdata/ $(<F)
|
||||
|
||||
#@DATABUILDDIR@/translit/%.res : $(top_srcdir)/../data/translit/%.txt
|
||||
# @echo "Creating translit resource file for $<"
|
||||
|
@ -77,7 +77,7 @@ distclean : distclean-local
|
||||
dist: dist-local
|
||||
check: all check-local
|
||||
|
||||
all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES)
|
||||
all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES) icupkg.inc
|
||||
|
||||
install-local: all-local
|
||||
$(mkinstalldirs) $(DESTDIR)$(sbindir)
|
||||
@ -90,7 +90,7 @@ clean-local:
|
||||
$(RMV) $(TARGET) $(OBJECTS)
|
||||
|
||||
distclean-local: clean-local
|
||||
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES)
|
||||
$(RMV) Makefile $(DEPS) $(RES_FILES) $(TEST_FILES) icupkg.inc
|
||||
|
||||
check-local: all-local
|
||||
|
||||
@ -98,6 +98,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
icupkg.inc: $(srcdir)/icupkg.inc.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
$(TARGET) : $(OBJECTS)
|
||||
$(LINK.c) -o $@ $^ $(LIBS)
|
||||
|
||||
|
@ -185,7 +185,7 @@ void pkg_mode_dll(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
|
||||
"\t-ls -l $@\n\n");
|
||||
|
||||
T_FileStream_writeLine(makefile, "$(TEMP_DIR)/hpux_junk_obj.cpp:\n"
|
||||
" echo \"void to_emit_cxx_stuff_in_the_linker(){}\" >> hpux_junk_obj.cpp\n"
|
||||
" echo \"void to_emit_cxx_stuff_in_the_linker(){}\" >> $(TEMP_DIR)/hpux_junk_obj.cpp\n"
|
||||
"\n"
|
||||
"$(TEMP_DIR)/hpux_junk_obj.o: $(TEMP_DIR)/hpux_junk_obj.cpp\n"
|
||||
" $(COMPILE.cc) -o $@ $<\n"
|
||||
|
112
icu4c/source/tools/pkgdata/icupkg.inc.in
Normal file
112
icu4c/source/tools/pkgdata/icupkg.inc.in
Normal file
@ -0,0 +1,112 @@
|
||||
#******************************************************************************
|
||||
#
|
||||
# Copyright (C) 2000, International Business Machines
|
||||
# Corporation and others. All Rights Reserved.
|
||||
#
|
||||
#******************************************************************************
|
||||
# This Makefile is used to build the ICU's data.
|
||||
# It is included with the -O option to pkgdata.
|
||||
|
||||
PLATFORM=@platform@
|
||||
|
||||
top_srcdir=@top_srcdir@
|
||||
srcdir=@srcdir@
|
||||
top_builddir=../..
|
||||
|
||||
SHELL=@SHELL@
|
||||
CFLAGS=@CFLAGS@
|
||||
CPPFLAGS=@CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common
|
||||
CXXFLAGS=@CXXFLAGS@
|
||||
FFLAGS=@FFLAGS@
|
||||
DEFS=@DEFS@
|
||||
# We're not linking anything with ICU libs
|
||||
#LDFLAGS=@LDFLAGS@ -L$(prefix)/lib $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
|
||||
LIBS=@LIBS@
|
||||
ICULIBS=$(LIBS) -licu-uc -licu-i18n
|
||||
exec_prefix=@exec_prefix@
|
||||
prefix=@prefix@
|
||||
program_transform_name=@program_transform_name@
|
||||
bindir=@bindir@
|
||||
sbindir=@sbindir@
|
||||
libexecdir=@libexecdir@
|
||||
datadir=@datadir@
|
||||
sysconfdir=@sysconfdir@
|
||||
sharedstatedir=@sharedstatedir@
|
||||
localstatedir=@localstatedir@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
oldincludedir=@oldincludedir@
|
||||
infodir=@infodir@
|
||||
mandir=@mandir@
|
||||
PACKAGE=@PACKAGE@
|
||||
VERSION=@VERSION@
|
||||
CC=@CC@
|
||||
CXX=@CXX@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
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@
|
||||
host_vendor=@host_vendor@
|
||||
host_os=@host_os@
|
||||
LIB_M=@LIB_M@
|
||||
CPP=@CPP@
|
||||
U_HAVE_INTTYPES_H=@U_HAVE_INTTYPES_H@
|
||||
U_IS_BIG_ENDIAN=@U_IS_BIG_ENDIAN@
|
||||
HAVE_INT8_T=@HAVE_INT8_T@
|
||||
HAVE_UINT8_T=@HAVE_UINT8_T@
|
||||
HAVE_INT16_T=@HAVE_INT16_T@
|
||||
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@
|
||||
|
||||
|
||||
ld_rpath_suf=@ld_rpath_suf@
|
||||
|
||||
|
||||
# begin host fragment
|
||||
@host_frag@
|
||||
# end host fragment
|
||||
|
||||
top_builddir = ../..
|
||||
subdir = tools/tmp
|
||||
|
||||
##### Add the following to source/config/Makefile.in
|
||||
|
||||
GENCCODE=$(top_builddir)/tools/genccode/genccode
|
||||
GENCMN=$(top_builddir)/tools/gencmn/gencmn
|
||||
|
||||
LPATHS=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil
|
||||
|
||||
TOOL=env LD_LIBRARY_PATH=$(LPATHS) LIBPATH=$(LPATHS)
|
||||
|
||||
ifeq ($(strip $(PLATFORM)),OS390)
|
||||
TOOL=
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(PLATFORM)),AIX)
|
||||
TOOL=env LIBPATH=$(LPATHS)
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(PLATFORM)),HPUX)
|
||||
TOOL=env LD_LIBRARY_PATH=$(LPATHS)
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(PLATFORM)),U_LINUX)
|
||||
TOOL=env LD_LIBRARY_PATH=$(LPATHS)
|
||||
endif
|
@ -25,6 +25,8 @@
|
||||
#include "toolutil.h"
|
||||
#include "unewdata.h"
|
||||
#include "uoptions.h"
|
||||
|
||||
U_CDECL_BEGIN
|
||||
#include "pkgtypes.h"
|
||||
#include "makefile.h"
|
||||
|
||||
@ -37,6 +39,8 @@ extern void pkg_mode_dll(UPKGOptions* o, FileStream *stream, UErrorCode *status)
|
||||
extern void pkg_mode_common(UPKGOptions* o, FileStream *stream, UErrorCode *status);
|
||||
#endif /*#ifdef WIN32*/
|
||||
|
||||
U_CDECL_END
|
||||
|
||||
static void loadLists(UPKGOptions *o, UErrorCode *status);
|
||||
|
||||
/* This sets the modes that are available */
|
||||
|
Loading…
Reference in New Issue
Block a user