From d0559ac03c66da938a17f99fc8a3bb65d0756f0e Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Fri, 2 Dec 2005 10:21:39 +0000 Subject: [PATCH] ICU-4948 Make the makefiles easier to compare against each other X-SVN-Rev: 18852 --- icu4c/source/common/Makefile.in | 18 ++++++----- icu4c/source/i18n/Makefile.in | 24 ++++++++------ icu4c/source/io/Makefile.in | 34 +++++++++++-------- icu4c/source/layout/Makefile.in | 35 ++++++++++++-------- icu4c/source/layoutex/Makefile.in | 37 ++++++++++++--------- icu4c/source/stubdata/Makefile.in | 26 ++++++++------- icu4c/source/test/cintltst/Makefile.in | 23 +++++++++---- icu4c/source/test/intltest/Makefile.in | 20 ++++++++---- icu4c/source/test/iotest/Makefile.in | 20 ++++++++---- icu4c/source/tools/ctestfw/Makefile.in | 39 +++++++++++----------- icu4c/source/tools/genbidi/Makefile.in | 42 +++++++++++------------- icu4c/source/tools/genbrk/Makefile.in | 34 +++++++++---------- icu4c/source/tools/gencase/Makefile.in | 42 +++++++++++------------- icu4c/source/tools/genccode/Makefile.in | 36 ++++++++++----------- icu4c/source/tools/gencmn/Makefile.in | 34 +++++++++---------- icu4c/source/tools/gencnval/Makefile.in | 38 ++++++++-------------- icu4c/source/tools/gennames/Makefile.in | 41 +++++++++++------------ icu4c/source/tools/gennorm/Makefile.in | 39 ++++++++++------------ icu4c/source/tools/genpname/Makefile.in | 29 +++++++++++++---- icu4c/source/tools/genprops/Makefile.in | 37 +++++++++------------ icu4c/source/tools/genrb/Makefile.in | 32 +++++++----------- icu4c/source/tools/gensprep/Makefile.in | 35 +++++++++----------- icu4c/source/tools/gentest/Makefile.in | 14 ++++---- icu4c/source/tools/genuca/Makefile.in | 40 +++++++++-------------- icu4c/source/tools/icupkg/Makefile.in | 20 ++++++------ icu4c/source/tools/icuswap/Makefile.in | 34 +++++++++---------- icu4c/source/tools/makeconv/Makefile.in | 43 +++++++++++-------------- icu4c/source/tools/pkgdata/Makefile.in | 36 +++++++++------------ icu4c/source/tools/toolutil/Makefile.in | 23 +++++++++---- 29 files changed, 468 insertions(+), 457 deletions(-) diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in index 9129f57cf56..91bc45a01d3 100644 --- a/icu4c/source/common/Makefile.in +++ b/icu4c/source/common/Makefile.in @@ -51,9 +51,12 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -LDFLAGS += $(LDFLAGSICUUC) -CPPFLAGS += -I. -I$(srcdir) -I$(top_srcdir)/i18n $(LIBCPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/i18n $(LIBCPPFLAGS) DEFS += -DU_COMMON_IMPLEMENTATION +LDFLAGS += $(LDFLAGSICUUC) # $(LIBICUDT) is either stub data or the real DLL common data. LIBS = $(LIBICUDT) $(DEFAULT_LIBS) @@ -78,12 +81,14 @@ serv.o servnotf.o servls.o servlk.o servlkf.o servrbf.o servslkf.o locutil.o \ uenum.o ustrenum.o uidna.o usprep.o punycode.o \ cwchar.o util.o parsepos.o utrace.o locbased.o +## Header files to install +HEADERS = $(srcdir)/unicode/*.h unicode/*.h + STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) DEPS = $(OBJECTS:.o=.d) -## Header files to install -HEADERS = $(srcdir)/unicode/*.h unicode/*.h +-include Makefile.local ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ @@ -101,8 +106,6 @@ distclean : distclean-local dist: dist-local check: all check-local --include Makefile.local - all-local: $(ALL_TARGETS) unicode/platform.h install-local: install-headers install-library @@ -167,10 +170,9 @@ $(SHARED_OBJECT): $(OBJECTS) $(SO_VERSION_DATA) $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(LIBS) ifeq ($(OS390BATCH),1) -$(BATCH_TARGET): $(OBJECTS) +$(BATCH_TARGET):$(OBJECTS) $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(BATCH_LIBS) endif # OS390BATCH - endif # ENABLE_SHARED ifeq (,$(MAKECMDGOALS)) diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index 89a43f0a932..218e47251aa 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -15,7 +15,6 @@ top_builddir = .. ## All the flags and other definitions are included here. include $(top_builddir)/icudefs.mk --include Makefile.local ## Build directory information subdir = i18n @@ -42,9 +41,9 @@ endif ifeq ($(OS390BATCH),1) BATCH_TARGET = $(BATCH_I18N_TARGET) BATCH_LIBS = $(BATCH_LIBICUUC) -lm -endif # OS390BATCH +endif # OS390BATCH -endif # ENABLE_SHARED +endif # ENABLE_SHARED ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET) @@ -52,9 +51,12 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -LDFLAGS += $(LDFLAGSICUI18N) -CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common $(LIBCPPFLAGS) DEFS += -DU_I18N_IMPLEMENTATION +LDFLAGS += $(LDFLAGSICUI18N) LIBS = $(LIBICUUC) $(DEFAULT_LIBS) OBJECTS = ucln_in.o \ @@ -74,13 +76,14 @@ name2uni.o uni2name.o nortrans.o quant.o transreg.o \ regexcmp.o rematch.o repattrn.o regexst.o uregex.o uregexc.o \ ulocdata.o measfmt.o currfmt.o curramt.o currunit.o measure.o utmscale.o +## Header files to install +HEADERS = $(srcdir)/unicode/*.h STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) DEPS = $(OBJECTS:.o=.d) -## Header files to install -HEADERS= $(srcdir)/unicode/*.h +-include Makefile.local ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ @@ -100,7 +103,7 @@ check: all check-local all-local: $(ALL_TARGETS) -install-local: install-headers install-library +install-local: install-headers install-library install-library: all-local $(MKINSTALLDIRS) $(DESTDIR)$(libdir) @@ -160,8 +163,8 @@ $(SHARED_OBJECT): $(OBJECTS) $(SO_VERSION_DATA) ifeq ($(OS390BATCH),1) $(BATCH_TARGET):$(OBJECTS) $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(BATCH_LIBS) -endif # OS390BATCH -endif +endif # OS390BATCH +endif # ENABLE_SHARED ifeq (,$(MAKECMDGOALS)) -include $(DEPS) @@ -170,3 +173,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/io/Makefile.in b/icu4c/source/io/Makefile.in index cb9083ea44e..e49e7f60425 100644 --- a/icu4c/source/io/Makefile.in +++ b/icu4c/source/io/Makefile.in @@ -4,7 +4,7 @@ # Corporation and others. All Rights Reserved. # #****************************************************************************** -## Makefile.in for ICU - io/libustdio.so +## Makefile.in for ICU - icuio.so ## Stephen F. Booth ## Source directory information @@ -43,7 +43,7 @@ BATCH_TARGET = $(BATCH_IO_TARGET) BATCH_LIBS = $(BATCH_LIBICUUC) $(BATCH_LIBICUI18N) -lm endif # OS390BATCH -endif +endif # ENABLE_SHARED ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) $(BATCH_TARGET) @@ -51,24 +51,31 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -LDFLAGS += $(LDFLAGSICUIO) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) DEFS += -DU_IO_IMPLEMENTATION +LDFLAGS += $(LDFLAGSICUIO) LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS) OBJECTS = locbund.o ufile.o ufmt_cmn.o uprintf.o uprntf_p.o \ uscanf.o uscanf_p.o ustdio.o sprintf.o sscanf.o \ ustream.o -STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) - +## Header files to install HEADERS = $(srcdir)/unicode/*.h +STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) + DEPS = $(OBJECTS:.o=.d) +-include Makefile.local + ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check check-local +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local install-library install-headers dist \ +dist-local check check-local ## Clear suffix list .SUFFIXES : @@ -83,7 +90,7 @@ check: all check-local all-local: $(ALL_TARGETS) -install-local: all-local install-headers install-library +install-local: install-headers install-library install-library: all-local $(MKINSTALLDIRS) $(DESTDIR)$(libdir) @@ -116,7 +123,6 @@ install-headers: $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode || exit; \ done - dist-local: clean-local: @@ -142,11 +148,10 @@ $(SHARED_OBJECT): $(OBJECTS) $(SO_VERSION_DATA) $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(LIBS) ifeq ($(OS390BATCH),1) -$(BATCH_TARGET): $(OBJECTS) +$(BATCH_TARGET):$(OBJECTS) $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(BATCH_LIBS) -endif # OS390BATCH - -endif +endif # OS390BATCH +endif # ENABLE_SHARED ifeq (,$(MAKECMDGOALS)) -include $(DEPS) @@ -155,3 +160,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/layout/Makefile.in b/icu4c/source/layout/Makefile.in index 5537d9049c1..e1cf161ab85 100644 --- a/icu4c/source/layout/Makefile.in +++ b/icu4c/source/layout/Makefile.in @@ -1,13 +1,18 @@ -## Copyright (c) 1999-2005, International Business Machines Corporation and -## others. All Rights Reserved. +#****************************************************************************** +# +# Copyright (C) 1999-2005, International Business Machines +# Corporation and others. All Rights Reserved. +# +#****************************************************************************** ## Makefile.in for ICU - layout -## Install directory information +## Source directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = .. +## All the flags and other definitions are included here. include $(top_builddir)/icudefs.mk ## Build directory information @@ -45,9 +50,12 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -LDFLAGS += $(LDFLAGSICULE) -CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/unicode -I$(srcdir)/.. $(LIBCPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)/common -I$(srcdir)/unicode $(LIBCPPFLAGS) DEFS += -DU_LAYOUT_IMPLEMENTATION +LDFLAGS += $(LDFLAGSICULE) LIBS = $(LIBICUUC) $(DEFAULT_LIBS) OBJECTS = LEFontInstance.o \ @@ -123,12 +131,14 @@ TibetanLayoutEngine.o \ TibetanReordering.o \ KernTable.o +## Header files to install +HEADERS= $(srcdir)/LayoutEngine.h $(srcdir)/LE*.h + STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) DEPS = $(OBJECTS:.o=.d) -## Header files to install -HEADERS= $(srcdir)/LayoutEngine.h $(srcdir)/LE*.h +-include Makefile.local ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ @@ -148,7 +158,7 @@ check: all check-local all-local: $(ALL_TARGETS) -install-local: install-headers install-library +install-local: install-headers install-library install-library: all-local $(MKINSTALLDIRS) $(DESTDIR)$(libdir) @@ -174,7 +184,6 @@ ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB)) endif endif - install-headers: $(MKINSTALLDIRS) $(DESTDIR)$(includedir)/layout @for file in $(HEADERS); do \ @@ -186,7 +195,7 @@ dist-local: clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) - $(RMV) $(OBJECTS) $(ALL_TARGETS) $(SO_VERSION_DATA) + $(RMV) $(OBJECTS) $(STATIC_OBJECTS) $(ALL_TARGETS) $(SO_VERSION_DATA) distclean-local: clean-local $(RMV) Makefile @@ -207,11 +216,10 @@ $(SHARED_OBJECT): $(OBJECTS) $(SO_VERSION_DATA) $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(LIBS) ifeq ($(OS390BATCH),1) -$(BATCH_TARGET): $(OBJECTS) +$(BATCH_TARGET):$(OBJECTS) $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(BATCH_LIBS) endif # OS390BATCH - -endif +endif # ENABLE_SHARED ifeq (,$(MAKECMDGOALS)) -include $(DEPS) @@ -221,4 +229,3 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) endif endif - diff --git a/icu4c/source/layoutex/Makefile.in b/icu4c/source/layoutex/Makefile.in index 5c739d0bbb6..dcfee9706f2 100644 --- a/icu4c/source/layoutex/Makefile.in +++ b/icu4c/source/layoutex/Makefile.in @@ -1,13 +1,18 @@ -## Copyright (c) 1999-2005, International Business Machines Corporation and -## others. All Rights Reserved. +#****************************************************************************** +# +# Copyright (C) 1999-2005, International Business Machines +# Corporation and others. All Rights Reserved. +# +#****************************************************************************** ## Makefile.in for ICU - layout -## Install directory information +## Source directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = .. +## All the flags and other definitions are included here. include $(top_builddir)/icudefs.mk ## Build directory information @@ -45,21 +50,26 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -LDFLAGS += $(LDFLAGSICULX) -CPPFLAGS += -I$(srcdir) -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(srcdir) -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_srcdir)/common $(LIBCPPFLAGS) DEFS += -DU_LAYOUTEX_IMPLEMENTATION +LDFLAGS += $(LDFLAGSICULX) LIBS = $(LIBICUUC) $(LIBICULE) $(DEFAULT_LIBS) OBJECTS = ParagraphLayout.o \ RunArrays.o \ LXUtilities.o +## Header files to install +HEADERS= $(srcdir)/layout/ParagraphLayout.h $(srcdir)/layout/RunArrays.h + STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) DEPS = $(OBJECTS:.o=.d) -## Header files to install -HEADERS= $(srcdir)/layout/ParagraphLayout.h $(srcdir)/layout/RunArrays.h +-include Makefile.local ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ @@ -79,7 +89,7 @@ check: all check-local all-local: $(ALL_TARGETS) -install-local: install-headers install-library +install-local: install-headers install-library install-library: all-local $(MKINSTALLDIRS) $(DESTDIR)$(libdir) @@ -98,14 +108,13 @@ endif ifneq ($(IMPORT_LIB_EXT),) $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir) ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB)) - cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(FINAL_IMPORT_LIB) $(notdir $(IMPORT_LIB)) + cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB)) endif ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB)) cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB)) endif endif - install-headers: $(MKINSTALLDIRS) $(DESTDIR)$(includedir)/layout @for file in $(HEADERS); do \ @@ -117,7 +126,7 @@ dist-local: clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) - $(RMV) $(OBJECTS) $(ALL_TARGETS) $(SO_VERSION_DATA) + $(RMV) $(OBJECTS) $(STATIC_OBJECTS) $(ALL_TARGETS) $(SO_VERSION_DATA) distclean-local: clean-local $(RMV) Makefile @@ -138,11 +147,10 @@ $(SHARED_OBJECT): $(OBJECTS) $(SO_VERSION_DATA) $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(LIBS) ifeq ($(OS390BATCH),1) -$(BATCH_TARGET): $(OBJECTS) +$(BATCH_TARGET):$(OBJECTS) $(SHLIB.cc) $(LD_SONAME) $(OUTOPT)$@ $^ $(BATCH_LIBS) endif # OS390BATCH - -endif +endif # ENABLE_SHARED ifeq (,$(MAKECMDGOALS)) -include $(DEPS) @@ -152,4 +160,3 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) endif endif - diff --git a/icu4c/source/stubdata/Makefile.in b/icu4c/source/stubdata/Makefile.in index 99b0d205619..22b3dd4ab17 100644 --- a/icu4c/source/stubdata/Makefile.in +++ b/icu4c/source/stubdata/Makefile.in @@ -19,7 +19,7 @@ include $(top_builddir)/icudefs.mk ## Build directory information subdir = stubdata -## Files to remove for 'make clean' +## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) $(IMPORT_LIB) $(MIDDLE_IMPORT_LIB) $(FINAL_IMPORT_LIB) ## Target information @@ -43,21 +43,27 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common $(LIBCPPFLAGS) LDFLAGS += $(LDFLAGSICUDT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) OBJECTS = stubdata.o -STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) - +## Header files to install HEADERS = +STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) + DEPS = $(OBJECTS:.o=.d) +-include Makefile.local ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check check-local +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local install-library dist \ +dist-local check check-local ## Clear suffix list .SUFFIXES : @@ -70,7 +76,6 @@ distclean : distclean-local dist: dist-local check: all check-local - all-local: $(ALL_TARGETS) install-local: install-library @@ -105,11 +110,11 @@ clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) $(RMV) $(OBJECTS) $(STATIC_OBJECTS) $(ALL_TARGETS) -check-local: - distclean-local: clean-local $(RMV) Makefile +check-local: + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -118,7 +123,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=common/unicode/platform.h CONFIG_HEADERS= $(SHELL) ./config.status - ifneq ($(ENABLE_STATIC),) $(TARGET): $(TARGET)($(STATIC_OBJECTS)) $(RANLIB) $@ @@ -132,7 +136,7 @@ ifeq ($(OS390BATCH),1) $(BATCH_STUB_TARGET): $(OBJECTS) $(SHLIB.c) $(LD_SONAME) $(OUTOPT)$@ $^ $(LIBS) endif # OS390BATCH -endif +endif # ENABLE_SHARED ifeq (,$(MAKECMDGOALS)) -include $(DEPS) diff --git a/icu4c/source/test/cintltst/Makefile.in b/icu4c/source/test/cintltst/Makefile.in index dbc74f5381c..5a38032fc35 100644 --- a/icu4c/source/test/cintltst/Makefile.in +++ b/icu4c/source/test/cintltst/Makefile.in @@ -1,6 +1,10 @@ +#****************************************************************************** +# +# Copyright (C) 1999-2005, International Business Machines +# Corporation and others. All Rights Reserved. +# +#****************************************************************************** ## Makefile.in for ICU - test/cintltst -## Copyright (c) 1999-2005, International Business Machines Corporation and -## others. All Rights Reserved. ## Source directory information srcdir = @srcdir@ @@ -8,6 +12,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. +## All the flags and other definitions are included here. include $(top_builddir)/icudefs.mk ## Build directory information @@ -20,8 +25,8 @@ CLEANFILES = *~ $(DEPS) TARGET = cintltst$(EXEEXT) # Oh, this hurts my sensibility. This is supposedly a C test and we need to -# link using a C++ compiler?! This must be done so that C++ static -# initialization works in the libraries, like mutex.cpp, ustdio and iostream. +# link using a C++ compiler?! This must be done so that library vtables +# work correctly on all platforms. ifneq ($(ENABLE_STATIC),) LINK = $(LINK.cc) @@ -37,8 +42,11 @@ BUILDDIR := $(BUILDDIR:test\\cintltst/../../=) # Simplify the path for Windows 98 BUILDDIR := $(BUILDDIR:TEST\\CINTLTST/../../=) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif # we define ICU_UNICODE_VERSION so we can test it -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil +CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil DEFS += -D'ICU_UNICODE_VERSION="$(UNICODE_VERSION)"' -D'ICU_VERSION="@VERSION@"' -D'ICUDATA_NAME="$(ICUDATA_PLATFORM_NAME)"' -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"' LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) @@ -57,6 +65,8 @@ idnatest.o nfsprep.o spreptst.o sprpdata.o hpmufn.o tracetst.o reapits.o utextts DEPS = $(OBJECTS:.o=.d) +-include Makefile.local + ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ distclean distclean-local dist dist-local check check-local @@ -85,8 +95,6 @@ clean-local: distclean-local: clean-local $(RMV) Makefile --include Makefile.local - check-local: all-local $(INVOKE) ./$(TARGET) $(CINTLTST_OPTS) @@ -106,3 +114,4 @@ ifneq ($(patsubst %install,,$(MAKECMDGOALS)),) endif endif endif + diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index 943783e8a8f..a2f026516ca 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -1,6 +1,10 @@ +#****************************************************************************** +# +# Copyright (C) 1999-2005, International Business Machines +# Corporation and others. All Rights Reserved. +# +#****************************************************************************** ## Makefile.in for ICU - test/intltest -## Copyright (c) 1999-2005, International Business Machines Corporation and -## others. All Rights Reserved. ## Source directory information srcdir = @srcdir@ @@ -8,6 +12,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. +## All the flags and other definitions are included here. include $(top_builddir)/icudefs.mk ## Build directory information @@ -27,7 +32,10 @@ BUILDDIR := $(BUILDDIR:test\\intltest/../../=) # Simplify the path for Windows 98 BUILDDIR := $(BUILDDIR:TEST\\INTLTEST/../../=) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"' LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) @@ -52,8 +60,10 @@ calcasts.o v32test.o uvectest.o textfile.o tokiter.o utxttest.o DEPS = $(OBJECTS:.o=.d) +-include Makefile.local + ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ +.PHONY : all all-local install install-local clean clean-local \ distclean distclean-local dist dist-local check check-local ## Clear suffix list @@ -80,8 +90,6 @@ clean-local: distclean-local: clean-local $(RMV) Makefile --include Makefile.local - check-local: all-local $(INVOKE) ./$(TARGET) $(INTLTEST_OPTS) || true diff --git a/icu4c/source/test/iotest/Makefile.in b/icu4c/source/test/iotest/Makefile.in index 795861440fb..bfdbcf4c39f 100644 --- a/icu4c/source/test/iotest/Makefile.in +++ b/icu4c/source/test/iotest/Makefile.in @@ -1,6 +1,10 @@ +#****************************************************************************** +# +# Copyright (C) 1999-2005, International Business Machines +# Corporation and others. All Rights Reserved. +# +#****************************************************************************** ## Makefile.in for ICU - test/iotest -## Copyright (c) 2002-2005, International Business Machines Corporation and -## others. All Rights Reserved. ## Source directory information srcdir = @srcdir@ @@ -8,6 +12,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. +## All the flags and other definitions are included here. include $(top_builddir)/icudefs.mk ## Build directory information @@ -27,8 +32,10 @@ BUILDDIR := $(BUILDDIR:test\\iotest/../../=) # Simplify the path for Windows 98 BUILDDIR := $(BUILDDIR:TEST\\IOTEST/../../=) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n \ --I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/io +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/io DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"' LIBS = $(LIBCTESTFW) $(LIBICUTOOLUTIL) $(LIBICUIO) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) @@ -36,6 +43,8 @@ OBJECTS = iotest.o stream.o strtst.o filetst.o trnstst.o DEPS = $(OBJECTS:.o=.d) +-include Makefile.local + ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ distclean distclean-local dist dist-local check check-local @@ -64,8 +73,6 @@ clean-local: distclean-local: clean-local $(RMV) Makefile --include Makefile.local - check-local: all-local $(INVOKE) ./$(TARGET) $(IOTEST_OPTS) || true @@ -85,3 +92,4 @@ ifneq ($(patsubst %install,,$(MAKECMDGOALS)),) endif endif endif + diff --git a/icu4c/source/tools/ctestfw/Makefile.in b/icu4c/source/tools/ctestfw/Makefile.in index 348953f9604..900f6434933 100644 --- a/icu4c/source/tools/ctestfw/Makefile.in +++ b/icu4c/source/tools/ctestfw/Makefile.in @@ -1,6 +1,10 @@ +#****************************************************************************** +# +# Copyright (C) 1999-2005, International Business Machines +# Corporation and others. All Rights Reserved. +# +#****************************************************************************** ## Makefile.in for ICU - tools/ctestfw -## Copyright (c) 1999-2005, International Business Machines Corporation and -## others. All Rights Reserved. ## Stephen F. Booth ## Source directory information @@ -9,6 +13,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. +## All the flags and other definitions are included here. include $(top_builddir)/icudefs.mk ## Build directory information @@ -19,16 +24,14 @@ CLEANFILES = *~ $(DEPS) $(IMPORT_LIB) $(MIDDLE_IMPORT_LIB) $(FINAL_IMPORT_LIB) ## Target information +TARGET_STUBNAME=$(CTESTFW_STUBNAME) + ifneq ($(ENABLE_STATIC),) -TARGET = $(LIBSICU)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX).$(A) +TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A) endif -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil -I$(srcdir) -DEFS += -DT_CTEST_IMPLEMENTATION - - ifneq ($(ENABLE_SHARED),) -SO_TARGET = $(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX).$(SO) +SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) endif @@ -38,6 +41,11 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil -I$(srcdir) $(LIBCPPFLAGS) +DEFS += -DT_CTEST_IMPLEMENTATION LDFLAGS += $(LDFLAGSCTESTFW) LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) @@ -47,6 +55,8 @@ STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) DEPS = $(OBJECTS:.o=.d) +-include Makefile.local + ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ distclean distclean-local dist dist-local check check-local @@ -67,18 +77,6 @@ all-local: $(ALL_TARGETS) install-local: install-library install-library: all-local -#echo This doesn't need to be installed normally -# $(MKINSTALLDIRS) $(DESTDIR)$(libdir) -#ifneq ($(ENABLE_STATIC),) -# $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET) -#endif -#ifneq ($(ENABLE_SHARED),) -# $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)/$(FINAL_SO_TARGET) -#ifneq ($(FINAL_SO_TARGET),$(SO_TARGET)) -# cd $(DESTDIR)$(libdir) && $(RM) $(MIDDLE_SO_TARGET) && ln -s $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) -# cd $(DESTDIR)$(libdir) && $(RM) $(SO_TARGET) && ln -s $(FINAL_SO_TARGET) $(SO_TARGET) -#endif -#endif dist-local: @@ -112,3 +110,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/genbidi/Makefile.in b/icu4c/source/tools/genbidi/Makefile.in index ae3dbb0a670..5e006918fe1 100644 --- a/icu4c/source/tools/genbidi/Makefile.in +++ b/icu4c/source/tools/genbidi/Makefile.in @@ -11,16 +11,14 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## +## Build directory information +subdir = tools/genbidi TARGET_STUB_NAME = genbidi SECTION = 8 -MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) - -## Build directory information -subdir = tools/genbidi +#MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) ## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) $(MAN_FILES) @@ -28,7 +26,10 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genbidi.o store.o @@ -36,9 +37,8 @@ OBJECTS = genbidi.o store.o DEPS = $(OBJECTS:.o=.d) ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -54,24 +54,11 @@ check: all check-local all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man -# $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) -# $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) -# man page install-man: $(MAN_FILES) # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) -# $(INSTALL_DATA) $< $(DESTDIR)$(mandir)/man$(SECTION) +# $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) -%.$(SECTION): $(srcdir)/%.$(SECTION).in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -# build postscript and pdf formats -#$(TARGET).ps: $(TARGET).$(SECTION) -# groff -man < $< > $@ - -#$(TARGET).pdf: $(TARGET).ps -# ps2pdf $< $@ dist-local: @@ -89,7 +76,13 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + + +%.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) @@ -98,3 +91,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/genbrk/Makefile.in b/icu4c/source/tools/genbrk/Makefile.in index 18ce1b205d6..e78afd16ea3 100644 --- a/icu4c/source/tools/genbrk/Makefile.in +++ b/icu4c/source/tools/genbrk/Makefile.in @@ -10,7 +10,8 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## +## Build directory information +subdir = tools/genbrk TARGET_STUB_NAME = genbrk @@ -18,16 +19,17 @@ SECTION = 1 MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) -## Build directory information -subdir = tools/genbrk ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(MAN_FILES) $(DEPS) +CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genbrk.o @@ -36,8 +38,7 @@ DEPS = $(OBJECTS:.o=.d) ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -50,15 +51,19 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) +all-local: $(TARGET) $(MAN_FILES) install-local: all-local $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(INSTALL) $(TARGET) $(DESTDIR)$(bindir) +install-man: $(MAN_FILES) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) + $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) + dist-local: -clean-local: +clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) $(RMV) $(TARGET) $(OBJECTS) @@ -72,22 +77,13 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) - - -# the 'mv' will always fail if you are building in the source dir + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) %.$(SECTION): $(srcdir)/%.$(SECTION).in cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -# build postscript and pdf formats -$(TARGET).ps: $(TARGET).$(SECTION) - groff -man < $< > $@ - -$(TARGET).pdf: $(TARGET).ps - ps2pdf $< $@ ifeq (,$(MAKECMDGOALS)) -include $(DEPS) diff --git a/icu4c/source/tools/gencase/Makefile.in b/icu4c/source/tools/gencase/Makefile.in index 6333080c9a1..2a537055955 100644 --- a/icu4c/source/tools/gencase/Makefile.in +++ b/icu4c/source/tools/gencase/Makefile.in @@ -11,16 +11,15 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## +## Build directory information +subdir = tools/gencase TARGET_STUB_NAME = gencase SECTION = 8 -MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) +#MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) -## Build directory information -subdir = tools/gencase ## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) $(MAN_FILES) @@ -28,7 +27,10 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gencase.o store.o @@ -36,9 +38,8 @@ OBJECTS = gencase.o store.o DEPS = $(OBJECTS:.o=.d) ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -54,24 +55,10 @@ check: all check-local all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man -# $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) -# $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) -# man page install-man: $(MAN_FILES) # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) -# $(INSTALL_DATA) $< $(DESTDIR)$(mandir)/man$(SECTION) - -%.$(SECTION): $(srcdir)/%.$(SECTION).in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -# build postscript and pdf formats -#$(TARGET).ps: $(TARGET).$(SECTION) -# groff -man < $< > $@ - -#$(TARGET).pdf: $(TARGET).ps -# ps2pdf $< $@ +# $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) dist-local: @@ -89,7 +76,13 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + + +%.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) @@ -98,3 +91,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index de86edca0b8..c44a908f601 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -14,23 +14,23 @@ include $(top_builddir)/icudefs.mk ## Build directory information subdir = tools/genccode -## - TARGET_STUB_NAME = genccode SECTION = 8 -MANX_FILES = $(TARGET_STUB_NAME).$(SECTION) +MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) -ALL_MAN_FILES = $(MANX_FILES) ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES) +CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genccode.o @@ -38,9 +38,8 @@ OBJECTS = genccode.o DEPS = $(OBJECTS:.o=.d) ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man install-manx +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -53,22 +52,16 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(ALL_MAN_FILES) +all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) -# man page -install-man: install-manx -install-manx: $(MANX_FILES) +install-man: $(MAN_FILES) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) -%.$(SECTION): $(srcdir)/%.$(SECTION).in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - dist-local: clean-local: @@ -85,7 +78,13 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) + $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) + + +%.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) @@ -94,3 +93,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/gencmn/Makefile.in b/icu4c/source/tools/gencmn/Makefile.in index b7bf8bbd55f..20d30f95433 100644 --- a/icu4c/source/tools/gencmn/Makefile.in +++ b/icu4c/source/tools/gencmn/Makefile.in @@ -14,25 +14,25 @@ include $(top_builddir)/icudefs.mk ## Build directory information subdir = tools/gencmn -## - TARGET_STUB_NAME = gencmn DECMN_STUB_NAME = decmn SECTION = 8 -MANX_FILES = $(TARGET_STUB_NAME).$(SECTION) $(DECMN_STUB_NAME).$(SECTION) +MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) $(DECMN_STUB_NAME).$(SECTION) -ALL_MAN_FILES = $(MANX_FILES) ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(DEPS) $(DECMN_DEP) $(ALL_MAN_FILES) +CLEANFILES = *~ $(DEPS) $(DECMN_DEP) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) DECMN = $(BINDIR)/$(DECMN_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gencmn.o @@ -42,9 +42,8 @@ DEPS = $(OBJECTS:.o=.d) DECMN_DEP = $(DECMN_OBJ:.o=.d) ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man install-manx +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -57,13 +56,17 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(DECMN) $(ALL_MAN_FILES) +all-local: $(TARGET) $(DECMN) $(MAN_FILES) install-local: all-local install-man $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) $(INSTALL) $(DECMN) $(DESTDIR)$(sbindir) +install-man: $(MAN_FILES) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) + $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) + dist-local: clean-local: @@ -80,16 +83,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) $(DECMN) : $(DECMN_OBJ) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) - -# man page -install-man: install-manx -install-manx: $(MANX_FILES) - $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) - $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) + $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) # This line is needed to serialize builds when the gmake -j option is used. $(DECMN:$(EXEEXT)=).$(SECTION): $(TARGET:$(EXEEXT)=).$(SECTION) @@ -98,6 +95,7 @@ $(DECMN:$(EXEEXT)=).$(SECTION): $(TARGET:$(EXEEXT)=).$(SECTION) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) -include $(DECMN_DEP) diff --git a/icu4c/source/tools/gencnval/Makefile.in b/icu4c/source/tools/gencnval/Makefile.in index 09af402bab0..a3b90420ddd 100644 --- a/icu4c/source/tools/gencnval/Makefile.in +++ b/icu4c/source/tools/gencnval/Makefile.in @@ -1,9 +1,9 @@ ## Makefile.in for ICU - tools/gencnval ## Copyright (c) 1999-2005, International Business Machines Corporation and ## others. All Rights Reserved. -## Steven R. Loomi +## Steven R. Loomis -## Install directory information +## Source directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -14,34 +14,32 @@ include $(top_builddir)/icudefs.mk ## Build directory information subdir = tools/gencnval -## - TARGET_STUB_NAME = gencnval SECTION = 1 -MANX_FILES = $(TARGET_STUB_NAME).$(SECTION) +MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) -ALL_MAN_FILES = $(MANX_FILES) ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(ALL_MAN_FILES) $(DEPS) +CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gencnval.o DEPS = $(OBJECTS:.o=.d) - ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man install-manx +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -54,12 +52,15 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(ALL_MAN_FILES) +all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(INSTALL) $(TARGET) $(DESTDIR)$(bindir) +install-man: $(MAN_FILES) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) + $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) dist-local: @@ -77,24 +78,13 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) -# man page -install-man: install-manx -install-manx: $(MANX_FILES) - $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) - $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) %.$(SECTION): $(srcdir)/%.$(SECTION).in cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -# only on linux probably ? -#$(TARGET).ps: $(TARGET).$(SECTION) -# groff -man < $< > $@ - -#$(TARGET).pdf: $(TARGET).ps -# ps2pdf $< $@ ifeq (,$(MAKECMDGOALS)) -include $(DEPS) diff --git a/icu4c/source/tools/gennames/Makefile.in b/icu4c/source/tools/gennames/Makefile.in index 5882f479afa..46162adaffc 100644 --- a/icu4c/source/tools/gennames/Makefile.in +++ b/icu4c/source/tools/gennames/Makefile.in @@ -1,9 +1,9 @@ ## Makefile.in for ICU - tools/gennames ## Copyright (c) 1999-2005, International Business Machines Corporation and ## others. All Rights Reserved. -## Steven R. Loomi +## Steven R. Loomis -## Install directory information +## Source directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -14,23 +14,23 @@ include $(top_builddir)/icudefs.mk ## Build directory information subdir = tools/gennames -## - TARGET_STUB_NAME = gennames SECTION = 8 -MANX_FILES = $(TARGET_STUB_NAME).$(SECTION) +#MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) -ALL_MAN_FILES = $(MANX_FILES) ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES) +CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gennames.o @@ -38,9 +38,8 @@ OBJECTS = gennames.o DEPS = $(OBJECTS:.o=.d) ## List of phony targets -.PHONY : all all-local install install-local clean clean-local\ -distclean distclean-local dist dist-local check \ -check-local install-man +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -53,24 +52,19 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(ALL_MAN_FILES) +all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man # $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) # $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) -# man page -install-man: $(MANX_FILES) +install-man: $(MAN_FILES) # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) # $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) -%.$(SECTION): $(srcdir)/%.$(SECTION).in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - dist-local: -clean-local: +clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) $(RMV) $(TARGET) $(OBJECTS) @@ -84,7 +78,13 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + + +%.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) @@ -93,3 +93,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/gennorm/Makefile.in b/icu4c/source/tools/gennorm/Makefile.in index 39e54287a8d..c2000d22fc1 100644 --- a/icu4c/source/tools/gennorm/Makefile.in +++ b/icu4c/source/tools/gennorm/Makefile.in @@ -11,16 +11,15 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## +## Build directory information +subdir = tools/gennorm TARGET_STUB_NAME = gennorm SECTION = 8 -MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) +#MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) -## Build directory information -subdir = tools/gennorm ## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) $(MAN_FILES) @@ -28,7 +27,10 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gennorm.o store.o @@ -36,9 +38,8 @@ OBJECTS = gennorm.o store.o DEPS = $(OBJECTS:.o=.d) ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -57,21 +58,9 @@ install-local: all-local install-man # $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) # $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) -# man page install-man: $(MAN_FILES) # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) -# $(INSTALL_DATA) $< $(DESTDIR)$(mandir)/man$(SECTION) - -%.$(SECTION): $(srcdir)/%.$(SECTION).in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -# build postscript and pdf formats -#$(TARGET).ps: $(TARGET).$(SECTION) -# groff -man < $< > $@ - -#$(TARGET).pdf: $(TARGET).ps -# ps2pdf $< $@ +# $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) dist-local: @@ -89,7 +78,13 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + + +%.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) diff --git a/icu4c/source/tools/genpname/Makefile.in b/icu4c/source/tools/genpname/Makefile.in index bd94865e075..3d1670d4236 100644 --- a/icu4c/source/tools/genpname/Makefile.in +++ b/icu4c/source/tools/genpname/Makefile.in @@ -11,20 +11,26 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## - ## Build directory information subdir = tools/genpname TARGET_STUB_NAME = genpname +SECTION = 8 + +MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) + + ## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genpname.o @@ -32,9 +38,8 @@ OBJECTS = genpname.o DEPS = $(OBJECTS:.o=.d) ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -47,12 +52,16 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(MAN_FILES) +all-local: $(TARGET) install-local: all-local # $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) # $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) +install-man: $(MAN_FILES) +# $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) +# $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) + dist-local: clean-local: @@ -71,6 +80,12 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + +%.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) else diff --git a/icu4c/source/tools/genprops/Makefile.in b/icu4c/source/tools/genprops/Makefile.in index 00495b09c39..3fd2fe97fca 100644 --- a/icu4c/source/tools/genprops/Makefile.in +++ b/icu4c/source/tools/genprops/Makefile.in @@ -11,16 +11,15 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## +## Build directory information +subdir = tools/genprops TARGET_STUB_NAME = genprops SECTION = 8 -MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) +#MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) -## Build directory information -subdir = tools/genprops ## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) $(MAN_FILES) @@ -28,7 +27,10 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genprops.o props2.o store.o @@ -36,9 +38,8 @@ OBJECTS = genprops.o props2.o store.o DEPS = $(OBJECTS:.o=.d) ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -57,21 +58,9 @@ install-local: all-local install-man # $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) # $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) -# man page install-man: $(MAN_FILES) # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) -# $(INSTALL_DATA) $< $(DESTDIR)$(mandir)/man$(SECTION) - -%.$(SECTION): $(srcdir)/%.$(SECTION).in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -# build postscript and pdf formats -#$(TARGET).ps: $(TARGET).$(SECTION) -# groff -man < $< > $@ - -#$(TARGET).pdf: $(TARGET).ps -# ps2pdf $< $@ +# $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) dist-local: @@ -91,6 +80,12 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + +%.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) else diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in index eef6861698f..8ec43fccb4b 100644 --- a/icu4c/source/tools/genrb/Makefile.in +++ b/icu4c/source/tools/genrb/Makefile.in @@ -10,7 +10,8 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## +## Build directory information +subdir = tools/genrb TARGET_STUB_NAME = genrb DERB_STUB_NAME = derb @@ -19,8 +20,6 @@ SECTION = 1 MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) $(DERB_STUB_NAME).$(SECTION) -## Build directory information -subdir = tools/genrb ## Extra files to remove for 'make clean' CLEANFILES = *~ $(MAN_FILES) $(DEPS) $(DERB_DEPS) @@ -29,7 +28,10 @@ CLEANFILES = *~ $(MAN_FILES) $(DEPS) $(DERB_DEPS) TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) DERB = $(BINDIR)/$(DERB_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -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 rbutil.o \ @@ -41,8 +43,7 @@ DERB_DEPS = $(DERB_OBJ:.o=.d) ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -62,9 +63,13 @@ install-local: all-local install-man $(INSTALL) $(TARGET) $(DESTDIR)$(bindir) $(INSTALL) $(DERB) $(DESTDIR)$(bindir) +install-man: $(MAN_FILES) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) + $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) + dist-local: -clean-local: +clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) $(RMV) $(TARGET) $(DERB) $(OBJECTS) $(DERB_OBJ) @@ -84,13 +89,6 @@ $(DERB) : $(DERB_OBJ) $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) -# the 'mv' will always fail if you are building in the source dir - -# man page -install-man: $(MAN_FILES) - $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) - $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) - # This line is needed to serialize builds when the gmake -j option is used. $(TARGET_STUB_NAME).$(SECTION): $(DERB_STUB_NAME).$(SECTION) @@ -98,12 +96,6 @@ $(TARGET_STUB_NAME).$(SECTION): $(DERB_STUB_NAME).$(SECTION) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -# build postscript and pdf formats -$(TARGET).ps: $(TARGET).$(SECTION) - groff -man < $< > $@ - -$(TARGET).pdf: $(TARGET).ps - ps2pdf $< $@ ifeq (,$(MAKECMDGOALS)) -include $(DEPS) diff --git a/icu4c/source/tools/gensprep/Makefile.in b/icu4c/source/tools/gensprep/Makefile.in index 8d40bc60f78..0739775d177 100644 --- a/icu4c/source/tools/gensprep/Makefile.in +++ b/icu4c/source/tools/gensprep/Makefile.in @@ -11,7 +11,8 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## +## Build directory information +subdir = tools/gensprep TARGET_STUB_NAME = gensprep @@ -19,8 +20,6 @@ SECTION = 8 MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) -## Build directory information -subdir = tools/gensprep ## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) $(MAN_FILES) @@ -28,7 +27,10 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gensprep.o store.o @@ -36,9 +38,8 @@ OBJECTS = gensprep.o store.o DEPS = $(OBJECTS:.o=.d) ## List of phony targets -.PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -57,21 +58,9 @@ install-local: all-local install-man $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) -# man page install-man: $(MAN_FILES) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) - $(INSTALL_DATA) $< $(DESTDIR)$(mandir)/man$(SECTION) - -%.$(SECTION): $(srcdir)/%.$(SECTION).in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -# build postscript and pdf formats -#$(TARGET).ps: $(TARGET).$(SECTION) -# groff -man < $< > $@ - -#$(TARGET).pdf: $(TARGET).ps -# ps2pdf $< $@ + $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) dist-local: @@ -91,6 +80,12 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(TARGET) : $(OBJECTS) $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + +%.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) else diff --git a/icu4c/source/tools/gentest/Makefile.in b/icu4c/source/tools/gentest/Makefile.in index ccfb5e911b6..39f1f9253b2 100644 --- a/icu4c/source/tools/gentest/Makefile.in +++ b/icu4c/source/tools/gentest/Makefile.in @@ -1,5 +1,4 @@ ## Makefile.in for ICU - tools/gentest - ## Copyright (c) 1999-2005, International Business Machines Corporation and ## others. All Rights Reserved. ## Madhu Katragadda @@ -15,15 +14,16 @@ include $(top_builddir)/icudefs.mk ## Build directory information subdir = tools/gentest -## - ## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) ## Target information TARGET = gentest$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gentest.o genres32.o @@ -32,8 +32,7 @@ DEPS = $(OBJECTS:.o=.d) ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local +distclean distclean-local dist dist-local check check-local ## Clear suffix list .SUFFIXES : @@ -52,7 +51,7 @@ install-local: all-local dist-local: -clean-local: +clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) $(RMV) $(TARGET) $(OBJECTS) @@ -76,4 +75,3 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) endif endif - diff --git a/icu4c/source/tools/genuca/Makefile.in b/icu4c/source/tools/genuca/Makefile.in index 3ec6f6b8d15..34fbb443a95 100644 --- a/icu4c/source/tools/genuca/Makefile.in +++ b/icu4c/source/tools/genuca/Makefile.in @@ -1,5 +1,5 @@ ## Makefile.in for ICU - tools/genuca -## Copyright (c) 1999-2004, International Business Machines Corporation and +## Copyright (c) 1999-2005, International Business Machines Corporation and ## others. All Rights Reserved. ## Source directory information @@ -10,7 +10,8 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## +## Build directory information +subdir = tools/genuca TARGET_STUB_NAME = genuca @@ -18,27 +19,26 @@ SECTION = 8 MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) -## Build directory information -subdir = tools/genuca ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(MAN_FILES) $(DEPS) +CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil LIBS = $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genuca.o DEPS = $(OBJECTS:.o=.d) - ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -51,15 +51,19 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(MAN_FILES) +all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) +install-man: $(MAN_FILES) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) + $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) + dist-local: -clean-local: +clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) $(RMV) $(TARGET) $(OBJECTS) @@ -76,23 +80,10 @@ $(TARGET) : $(OBJECTS) $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) -# the 'mv' will always fail if you are building in the source dir - -# man page -install-man: $(MAN_FILES) - $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) - $(INSTALL_DATA) $< $(DESTDIR)$(mandir)/man$(SECTION) - %.$(SECTION): $(srcdir)/%.$(SECTION).in cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -# build postscript and pdf formats -#$(TARGET).ps: $(TARGET).$(SECTION) -# groff -man < $< > $@ - -#$(TARGET).pdf: $(TARGET).ps -# ps2pdf $< $@ ifeq (,$(MAKECMDGOALS)) -include $(DEPS) @@ -101,3 +92,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/icupkg/Makefile.in b/icu4c/source/tools/icupkg/Makefile.in index 000747e7af2..088a8ecdcdc 100644 --- a/icu4c/source/tools/icupkg/Makefile.in +++ b/icu4c/source/tools/icupkg/Makefile.in @@ -25,12 +25,15 @@ SECTION = 1 #ALL_MAN_FILES = $(MANX_FILES) ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES) +CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = icupkg.o @@ -39,8 +42,7 @@ DEPS = $(OBJECTS:.o=.d) ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man install-manx +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -53,7 +55,7 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(ALL_MAN_FILES) +all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) @@ -75,11 +77,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) -# man page -install-man: install-manx -install-manx: $(MANX_FILES) +install-man: $(MAN_FILES) # $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) # $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) @@ -87,6 +87,7 @@ install-manx: $(MANX_FILES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) else @@ -94,3 +95,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/icuswap/Makefile.in b/icu4c/source/tools/icuswap/Makefile.in index 7ceecd9cc88..5d78b85e6c4 100644 --- a/icu4c/source/tools/icuswap/Makefile.in +++ b/icu4c/source/tools/icuswap/Makefile.in @@ -14,23 +14,22 @@ include $(top_builddir)/icudefs.mk ## Build directory information subdir = tools/icuswap -## - TARGET_STUB_NAME = icuswap -SECTION = 1 +SECTION = 8 -#MANX_FILES = $(TARGET_STUB_NAME).$(SECTION) - -#ALL_MAN_FILES = $(MANX_FILES) +#MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES) +CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = icuswap.o @@ -39,8 +38,7 @@ DEPS = $(OBJECTS:.o=.d) ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man install-manx +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -53,12 +51,17 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(ALL_MAN_FILES) +all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir) +install-man: $(MAN_FILES) +# $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) +# $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) + + dist-local: clean-local: @@ -75,18 +78,14 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status $(TARGET) : $(OBJECTS) - $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) -# man page -install-man: install-manx -install-manx: $(MANX_FILES) -# $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) -# $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) %.$(SECTION): $(srcdir)/%.$(SECTION).in cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) else @@ -94,3 +93,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/makeconv/Makefile.in b/icu4c/source/tools/makeconv/Makefile.in index 2dbd9d7cd4e..91e2124d8d4 100644 --- a/icu4c/source/tools/makeconv/Makefile.in +++ b/icu4c/source/tools/makeconv/Makefile.in @@ -11,38 +11,34 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## +## Build directory information +subdir = tools/makeconv TARGET_STUB_NAME = makeconv SECTION = 1 -MANX_FILES = $(TARGET_STUB_NAME).$(SECTION) - -ALL_MAN_FILES = $(MANX_FILES) - - -## Build directory information -subdir = tools/makeconv +MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(ALL_MAN_FILES) $(DEPS) +CLEANFILES = *~ $(DEPS) $(MAN_FILES) ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = makeconv.o ucnvstat.o genmbcs.o gencnvex.o DEPS = $(OBJECTS:.o=.d) - ## List of phony targets -.PHONY : all all-local install install-local install-man clean clean-local \ - distclean distclean-local dist dist-local check \ - check-local +.PHONY : all all-local install install-local clean clean-local \ +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -55,17 +51,18 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(ALL_MAN_FILES) +all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(INSTALL) $(TARGET) $(DESTDIR)$(bindir) -dist-local: +install-man: $(MAN_FILES) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) + $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) -rebuild: $(TARGET) - -$(RMV) - $(MAKE) all-local + +dist-local: clean-local: test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) @@ -76,18 +73,13 @@ distclean-local: clean-local check-local: all-local - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(TARGET): $(OBJECTS) +$(TARGET) : $(OBJECTS) $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) -install-man: install-manx -install-manx: $(MANX_FILES) - $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) - $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) %.$(SECTION): $(srcdir)/%.$(SECTION).in cd $(top_builddir) \ @@ -101,3 +93,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/pkgdata/Makefile.in b/icu4c/source/tools/pkgdata/Makefile.in index b2a424d19b6..9818e5df5f8 100644 --- a/icu4c/source/tools/pkgdata/Makefile.in +++ b/icu4c/source/tools/pkgdata/Makefile.in @@ -14,18 +14,14 @@ include $(top_builddir)/icudefs.mk ## Build directory information subdir = tools/pkgdata -## - TARGET_STUB_NAME = pkgdata SECTION = 1 -MANX_FILES = $(TARGET_STUB_NAME).$(SECTION) - -ALL_MAN_FILES = $(MANX_FILES) +MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) ## Extra files to remove for 'make clean' -CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES) +CLEANFILES = *~ $(DEPS) $(MAN_FILES) ifneq ($(PKGDATA_DEFS),) DEFS += $(PKGDATA_DEFS) @@ -34,7 +30,10 @@ endif ## Target information TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil DEFS += -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\" LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) @@ -44,8 +43,7 @@ DEPS = $(OBJECTS:.o=.d) ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check \ -check-local install-man install-manx +distclean distclean-local dist dist-local check check-local install-man ## Clear suffix list .SUFFIXES : @@ -58,21 +56,16 @@ distclean : distclean-local dist: dist-local check: all check-local -all-local: $(TARGET) $(ALL_MAN_FILES) +all-local: $(TARGET) $(MAN_FILES) install-local: all-local install-man $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(INSTALL) $(TARGET) $(DESTDIR)$(bindir) -# man page -install-man: install-manx -install-manx: $(MANX_FILES) +install-man: $(MAN_FILES) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) -%.$(SECTION): $(srcdir)/%.$(SECTION).in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status dist-local: @@ -89,13 +82,15 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - $(TARGET) : $(OBJECTS) $(LINK.c) $(OUTOPT)$@ $^ $(LIBS) + +%.$(SECTION): $(srcdir)/%.$(SECTION).in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + ifeq (,$(MAKECMDGOALS)) -include $(DEPS) else @@ -103,3 +98,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif + diff --git a/icu4c/source/tools/toolutil/Makefile.in b/icu4c/source/tools/toolutil/Makefile.in index 234dc071f1a..0fa1d97c865 100644 --- a/icu4c/source/tools/toolutil/Makefile.in +++ b/icu4c/source/tools/toolutil/Makefile.in @@ -1,6 +1,9 @@ -## Copyright (C) 1999-2005, International Business Machines Corporation -## and others. All Rights Reserved. - +#****************************************************************************** +# +# Copyright (C) 1999-2005, International Business Machines +# Corporation and others. All Rights Reserved. +# +#****************************************************************************** ## Makefile.in for ICU - tools/toolutil ## Steven R. Loomis @@ -10,6 +13,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. +## All the flags and other definitions are included here. include $(top_builddir)/icudefs.mk ## Build directory information @@ -37,9 +41,12 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -LDFLAGS += $(LDFLAGSICUTOOLUTIL) -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) +ifneq ($(top_builddir),$(top_srcdir)) +CPPFLAGS += -I$(top_builddir)/common +endif +CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) DEFS += -DU_TOOLUTIL_IMPLEMENTATION +LDFLAGS += $(LDFLAGSICUTOOLUTIL) LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) OBJECTS = filestrm.o package.o pkgitems.o propsvec.o swapimpl.o toolutil.o unewdata.o \ @@ -50,9 +57,12 @@ STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O)) DEPS = $(OBJECTS:.o=.d) +-include Makefile.local + ## List of phony targets .PHONY : all all-local install install-local clean clean-local \ -distclean distclean-local dist dist-local check check-local install-library +distclean distclean-local install-library dist \ +dist-local check check-local ## Clear suffix list .SUFFIXES : @@ -116,3 +126,4 @@ ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),) -include $(DEPS) endif endif +