1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
|
Index: lang/usenglish/Makefile
===================================================================
--- flite-1.3-release/lang/usenglish/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/lang/usenglish/Makefile (.../release-1.2) (revision 7)
@@ -38,6 +38,7 @@
DIRNAME=lang/usenglish
BUILD_DIRS =
ALL_DIRS=
+include $(TOP)/config/config
H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \
us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h
SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \
@@ -45,7 +46,11 @@
us_phoneset.c us_ffeatures.c us_phrasing_cart.c \
us_gpos.c us_text.c us_expand.c us_postlex.c \
us_nums_cart.c us_aswd.c usenglish.c
-OBJS = $(SRCS:.c=.o)
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
SCM=
FILES = Makefile $(SCM) $(SRCS) $(H)
LIBNAME = flite_usenglish
Index: lang/cmu_us_kal/Makefile
===================================================================
--- flite-1.3-release/lang/cmu_us_kal/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/lang/cmu_us_kal/Makefile (.../release-1.2) (revision 7)
@@ -43,7 +43,12 @@
cmu_us_kal_lpc.c \
cmu_us_kal_res.c \
cmu_us_kal_residx.c
-OBJS = $(SRCS:.c=.o)
+include $(TOP)/config/config
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
SCM=
FILES = Makefile $(SCM) $(SRCS) $(H)
LIBNAME = flite_cmu_us_kal
Index: lang/cmu_us_kal16/Makefile
===================================================================
--- flite-1.3-release/lang/cmu_us_kal16/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/lang/cmu_us_kal16/Makefile (.../release-1.2) (revision 7)
@@ -44,7 +44,12 @@
cmu_us_kal16_lpc.c \
cmu_us_kal16_res.c \
cmu_us_kal16_residx.c
-OBJS = $(SRCS:.c=.o)
+include $(TOP)/config/config
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
SCM=
FILES = Makefile $(SCM) $(SRCS) $(H)
LIBNAME = flite_cmu_us_kal16
Index: lang/cmu_time_awb/Makefile
===================================================================
--- flite-1.3-release/lang/cmu_time_awb/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/lang/cmu_time_awb/Makefile (.../release-1.2) (revision 7)
@@ -45,7 +45,12 @@
cmu_time_awb_mcep.c \
cmu_time_awb_lpc.c \
cmu_time_awb_lex_entry.c
-OBJS = $(SRCS:.c=.o)
+include $(TOP)/config/config
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
SCM=
FILES = Makefile $(SCM) $(SRCS) $(H)
LIBNAME = flite_cmu_time_awb
Index: lang/cmulex/Makefile
===================================================================
--- flite-1.3-release/lang/cmulex/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/lang/cmulex/Makefile (.../release-1.2) (revision 7)
@@ -38,13 +38,20 @@
DIRNAME=lang/cmulex
BUILD_DIRS =
ALL_DIRS=
+
H = cmu_lts_model.h cmulex.h
SRCS = cmu_lts_rules.c cmu_lts_model.c \
cmu_lex.c cmu_lex_entries.c cmu_lex_data.c
LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \
cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c
-OBJS = $(SRCS:.c=.o)
+include $(TOP)/config/config
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
+
SCRIPTS=make_cmulex
SCM=
Index: src/hrg/Makefile
===================================================================
--- flite-1.3-release/src/hrg/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/src/hrg/Makefile (.../release-1.2) (revision 7)
@@ -39,9 +39,14 @@
BUILD_DIRS =
ALL_DIRS=
H =
+include $(TOP)/config/config
SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \
cst_rel_io.c
-OBJS = $(SRCS:.c=.o)
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
FILES = Makefile $(H) $(SRCS)
LIBNAME = flite
Index: src/utils/Makefile
===================================================================
--- flite-1.3-release/src/utils/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/src/utils/Makefile (.../release-1.2) (revision 7)
@@ -44,8 +44,13 @@
cst_tokenstream.c cst_val.c cst_features.c \
cst_endian.c cst_socket.c cst_val_const.c \
cst_val_user.c cst_args.c
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \
+ $(STDIOTYPE:%=cst_file_%.os)
+else
OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \
$(STDIOTYPE:%=cst_file_%.o)
+endif
FILES = Makefile $(H) $(SRCS) \
cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \
cst_file_stdio.c cst_file_wince.c cst_file_palmos.c
Index: src/audio/Makefile
===================================================================
--- flite-1.3-release/src/audio/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/src/audio/Makefile (.../release-1.2) (revision 7)
@@ -43,9 +43,13 @@
BASESRCS = auclient.c auserver.c audio.c
SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c)
-OBJS = $(SRCS:.c=.o)
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \
- au_oss.c au_sun.c au_wince.c au_palmos.c
+ au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c
LIBNAME = flite
LOCAL_INCLUDES = -I. $(AUDIODEFS)
Index: src/lexicon/Makefile
===================================================================
--- flite-1.3-release/src/lexicon/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/src/lexicon/Makefile (.../release-1.2) (revision 7)
@@ -38,8 +38,13 @@
DIRNAME=src/lexicon
BUILD_DIRS =
ALL_DIRS=
+include $(TOP)/config/config
SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c
-OBJS = $(SRCS:.c=.o)
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
FILES = Makefile $(SRCS)
LIBNAME = flite
Index: src/synth/Makefile
===================================================================
--- flite-1.3-release/src/synth/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/src/synth/Makefile (.../release-1.2) (revision 7)
@@ -38,9 +38,14 @@
DIRNAME=src/synth
BUILD_DIRS =
ALL_DIRS=
+include $(TOP)/config/config
SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \
flite.c
-OBJS = $(SRCS:.c=.o)
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
FILES = Makefile $(SRCS)
LIBNAME = flite
Index: src/speech/Makefile
===================================================================
--- flite-1.3-release/src/speech/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/src/speech/Makefile (.../release-1.2) (revision 7)
@@ -39,9 +39,14 @@
BUILD_DIRS =
ALL_DIRS=
H =
+include $(TOP)/config/config
SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \
cst_wave_utils.c cst_lpcres.c rateconv.c
-OBJS = $(SRCS:.c=.o)
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
FILES = Makefile $(H) $(SRCS)
LIBNAME = flite
Index: src/wavesynth/Makefile
===================================================================
--- flite-1.3-release/src/wavesynth/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/src/wavesynth/Makefile (.../release-1.2) (revision 7)
@@ -38,9 +38,14 @@
DIRNAME=src/wavesynth
BUILD_DIRS =
ALL_DIRS=
+include $(TOP)/config/config
SRCS = cst_units.c cst_sigpr.c cst_clunits.c cst_diphone.c \
cst_sigprFP.c cst_sts.c cst_reflpc.c
-OBJS = $(SRCS:.c=.o)
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
LIBNAME = flite
FILES = Makefile $(SRCS)
Index: src/regex/Makefile
===================================================================
--- flite-1.3-release/src/regex/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/src/regex/Makefile (.../release-1.2) (revision 7)
@@ -42,8 +42,13 @@
DIRNAME=src/regex
BUILD_DIRS =
ALL_DIRS=
+include $(TOP)/config/config
SRCS = cst_regex.c regexp.c regsub.c
-OBJS = $(SRCS:.c=.o)
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
FILES = Makefile $(H) $(SRCS)
LIBNAME = flite
Index: src/stats/Makefile
===================================================================
--- flite-1.3-release/src/stats/Makefile (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/src/stats/Makefile (.../release-1.2) (revision 7)
@@ -39,8 +39,13 @@
BUILD_DIRS =
ALL_DIRS=
H =
+include $(TOP)/config/config
SRCS = cst_cart.c cst_viterbi.c cst_ss.c
-OBJS = $(SRCS:.c=.o)
+ifdef SHFLAGS
+OBJS := $(SRCS:.c=.os)
+else
+OBJS := $(SRCS:.c=.o)
+endif
FILES = Makefile $(H) $(SRCS)
LIBNAME = flite
Index: config/common_make_rules
===================================================================
--- flite-1.3-release/config/common_make_rules (.../flite-1.3-orig) (revision 7)
+++ flite-1.3-release/config/common_make_rules (.../release-1.2) (revision 7)
@@ -73,12 +73,13 @@
ifdef SHFLAGS
SOOBJS = $(OBJS:.o=.os)
FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
-ifdef LIBNAME
-ALL += $(OBJDIR)/.build_so
+#ifdef LIBNAME
+#ALL += $(OBJDIR)/.build_so
+#endif
endif
-endif
ifdef LIBNAME
ALL += $(OBJDIR)/.build_lib
+ALL += $(OBJDIR)/.build_so
endif
# Only do some directories when you are not cross compiling
ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
@@ -117,14 +118,17 @@
@ touch $(OBJDIR)/.build_so
# Used in the lib/ directory and in building new voices
-$(OBJDIR)/%.so: %.shared.a
+#$(OBJDIR)/%.so: %.shared.a
+%.so: %.shared.a
@ echo making $@
@ rm -rf shared_os && mkdir shared_os
@ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
@ (cd shared_os && ar x ../$<)
- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
+ @ (cd shared_os && $(CC) $(filter-out -lflite, $(LDFLAGS)) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
+ #@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
+ #@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@
@ rm -rf shared_os
$(OBJDIR)/.make_build_dirs:
Index: lib/Makefile
===================================================================
--- flite-1.3-release/lib/Makefile (.../flite-1.3-orig) (revision 0)
+++ flite-1.3-release/lib/Makefile (.../release-1.2) (revision 7)
@@ -0,0 +1,70 @@
+###########################################################################
+## ##
+## Language Technologies Institute ##
+## Carnegie Mellon University ##
+## Copyright (c) 1999 ##
+## All Rights Reserved. ##
+## ##
+## Permission is hereby granted, free of charge, to use and distribute ##
+## this software and its documentation without restriction, including ##
+## without limitation the rights to use, copy, modify, merge, publish, ##
+## distribute, sublicense, and/or sell copies of this work, and to ##
+## permit persons to whom this work is furnished to do so, subject to ##
+## the following conditions: ##
+## 1. The code must retain the above copyright notice, this list of ##
+## conditions and the following disclaimer. ##
+## 2. Any modifications must be clearly marked as such. ##
+## 3. Original authors' names are not deleted. ##
+## 4. The authors' names are not used to endorse or promote products ##
+## derived from this software without specific prior written ##
+## permission. ##
+## ##
+## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ##
+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ##
+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ##
+## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ##
+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ##
+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ##
+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ##
+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ##
+## THIS SOFTWARE. ##
+## ##
+###########################################################################
+## ##
+## FLITE libraries ##
+## ##
+###########################################################################
+TOP=..
+DIRNAME=lib
+BUILD_DIRS =
+ALL_DIRS=
+FILES = Makefile
+LIBNAMES = flite flite_cmulex flite_usenglish \
+ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb
+
+STATICLIBS= $(LIBNAMES:%=lib%.a)
+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a)
+#SHAREDLIBS = $(LIBNAMES:%=lib%.so)
+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
+ALL_LIBS = $(STATICLIBS) $(SHAREDLIBS) $(VERSIONSHAREDLIBS)
+
+ALL = shared_libs
+
+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION}
+
+include $(TOP)/config/common_make_rules
+
+ifdef SHFLAGS
+shared_libs: $(SHAREDLIBS)
+else
+shared_libs: nothing
+endif
+
+install:
+ @ cp -vf $(LIBDIR)/* .
+ @ $(MAKE) shared_libs
+ @ echo ARLIBS: $(SHAREDARLIBS)
+ @ echo SHARLIBS: $(SHAREDLIBS)
+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
|
