View | Details | Raw Unified | Return to issue 13725
Collapse All | Expand All

(-)makefile.mk (-13 / +17 lines)
Lines 74-80 Link Here
74
TARFILE_NAME=icu-2.2
74
TARFILE_NAME=icu-2.2
75
TARFILE_ROOTDIR=icu
75
TARFILE_ROOTDIR=icu
76
76
77
# There is an additional change to layout/Makefile.in to compile on MACOSX (fixed in icu 2.4)
78
.IF "$(OS)"=="MACOSX"
79
PATCH_FILE_NAME=icu-2.2.macosx.patch
80
.ELSE
77
PATCH_FILE_NAME=icu-2.2.patch
81
PATCH_FILE_NAME=icu-2.2.patch
82
.ENDIF			# "$(OS)"=="MACOSX"
78
83
79
ADDITIONAL_FILES=source$/data$/brkitr$/edit_word.txt \
84
ADDITIONAL_FILES=source$/data$/brkitr$/edit_word.txt \
80
		source$/data$/brkitr$/dict_word.txt \
85
		source$/data$/brkitr$/dict_word.txt \
Lines 106-128 Link Here
106
111
107
BUILD_DIR=$(CONFIGURE_DIR)
112
BUILD_DIR=$(CONFIGURE_DIR)
108
BUILD_ACTION=$(GNUMAKE)
113
BUILD_ACTION=$(GNUMAKE)
109
110
OUT2LIB= \
114
OUT2LIB= \
111
	$(BUILD_DIR)$/data$/out$/libicudata.so.22.0 \
115
	$(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST).22.0 \
112
	$(BUILD_DIR)$/data$/out$/libicudata.so.22 \
116
	$(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST).22 \
113
	$(BUILD_DIR)$/data$/out$/libicudata.so \
117
	$(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST) \
114
	$(BUILD_DIR)$/common$/libicuuc.a \
118
	$(BUILD_DIR)$/common$/libicuuc.a \
115
	$(BUILD_DIR)$/common$/libicuuc.so.22.0 \
119
	$(BUILD_DIR)$/common$/libicuuc$(DLLPOST).22.0 \
116
	$(BUILD_DIR)$/common$/libicuuc.so.22 \
120
	$(BUILD_DIR)$/common$/libicuuc$(DLLPOST).22 \
117
	$(BUILD_DIR)$/common$/libicuuc.so \
121
	$(BUILD_DIR)$/common$/libicuuc$(DLLPOST) \
118
	$(BUILD_DIR)$/i18n$/libicui18n.a \
122
	$(BUILD_DIR)$/i18n$/libicui18n.a \
119
	$(BUILD_DIR)$/i18n$/libicui18n.so.22.0 \
123
	$(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST).22.0 \
120
	$(BUILD_DIR)$/i18n$/libicui18n.so.22 \
124
	$(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST).22 \
121
	$(BUILD_DIR)$/i18n$/libicui18n.so \
125
	$(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST) \
122
	$(BUILD_DIR)$/layout$/libicule.a \
126
	$(BUILD_DIR)$/layout$/libicule.a \
123
	$(BUILD_DIR)$/layout$/libicule.so.22.0 \
127
	$(BUILD_DIR)$/layout$/libicule$(DLLPOST).22.0 \
124
	$(BUILD_DIR)$/layout$/libicule.so.22 \
128
	$(BUILD_DIR)$/layout$/libicule$(DLLPOST).22 \
125
	$(BUILD_DIR)$/layout$/libicule.so
129
	$(BUILD_DIR)$/layout$/libicule$(DLLPOST)
126
.ENDIF
130
.ENDIF
127
131
128
.IF "$(GUI)"=="WNT"
132
.IF "$(GUI)"=="WNT"

Return to issue 13725