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)/$@ + #@ 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 -)