|
 |
005971 |
diff -uNr flite-1.3-release/config/common_make_rules flite-1.3-release-mod/config/common_make_rules
|
|
|
005971 |
--- flite-1.3-release/config/common_make_rules 2004-12-20 00:20:43.000000000 +0200
|
|
|
005971 |
+++ flite-1.3-release-mod/config/common_make_rules 2006-11-12 12:17:25.000000000 +0200
|
|
|
005971 |
@@ -59,27 +59,35 @@
|
|
|
005971 |
endif
|
|
|
005971 |
OBJDIR=$(BUILDDIR)/obj/$(DIRNAME)
|
|
|
005971 |
BINDIR=$(BUILDDIR)/bin
|
|
|
005971 |
+LIBDIR=$(BUILDDIR)/lib
|
|
|
005971 |
ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
|
|
|
005971 |
BINDIR=$(TOP)/bin
|
|
|
005971 |
+LIBDIR=$(TOP)/lib
|
|
|
005971 |
endif
|
|
|
005971 |
|
|
|
005971 |
-LIBDIR=$(BUILDDIR)/lib
|
|
|
005971 |
BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
|
|
|
005971 |
|
|
|
005971 |
-FLITELIBS = $(BUILDDIR)/lib/libflite.a
|
|
|
005971 |
-LDFLAGS += -L$(BUILDDIR)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
|
|
|
005971 |
+ifdef SHFLAGS
|
|
|
005971 |
+FLITELIBS = $(LIBDIR)/libflite.so
|
|
|
005971 |
+LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS)
|
|
|
005971 |
+else
|
|
|
005971 |
+FLITELIBS = $(LIBDIR)/libflite.a
|
|
|
005971 |
+LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
|
|
|
005971 |
+endif
|
|
|
005971 |
|
|
|
005971 |
FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
|
|
|
005971 |
ifdef SHFLAGS
|
|
|
005971 |
SOOBJS = $(OBJS:.o=.os)
|
|
|
005971 |
-FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
|
|
|
005971 |
+FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%)
|
|
|
005971 |
ifdef LIBNAME
|
|
|
005971 |
ALL += $(OBJDIR)/.build_so
|
|
|
005971 |
endif
|
|
|
005971 |
-endif
|
|
|
005971 |
+else
|
|
|
005971 |
ifdef LIBNAME
|
|
|
005971 |
ALL += $(OBJDIR)/.build_lib
|
|
|
005971 |
endif
|
|
|
005971 |
+endif
|
|
|
005971 |
+
|
|
|
005971 |
# Only do some directories when you are not cross compiling
|
|
|
005971 |
ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
|
|
|
005971 |
OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS)
|
|
|
005971 |
@@ -117,14 +125,14 @@
|
|
|
005971 |
@ touch $(OBJDIR)/.build_so
|
|
|
005971 |
|
|
|
005971 |
# Used in the lib/ directory and in building new voices
|
|
|
005971 |
-$(OBJDIR)/%.so: %.shared.a
|
|
|
005971 |
+%.so: %.shared.a
|
|
|
005971 |
@ echo making $@
|
|
|
005971 |
@ rm -rf shared_os && mkdir shared_os
|
|
|
005971 |
- @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
|
|
|
005971 |
+ @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
|
|
|
005971 |
@ (cd shared_os && ar x ../$<)
|
|
|
005971 |
- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
|
|
|
005971 |
- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
|
|
|
005971 |
- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
|
|
|
005971 |
+ @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS)))
|
|
|
005971 |
+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
|
|
|
005971 |
+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@
|
|
|
005971 |
@ rm -rf shared_os
|
|
|
005971 |
|
|
|
005971 |
$(OBJDIR)/.make_build_dirs:
|
|
|
005971 |
diff -uNr flite-1.3-release/lib/Makefile flite-1.3-release-mod/lib/Makefile
|
|
|
005971 |
--- flite-1.3-release/lib/Makefile 1970-01-01 02:00:00.000000000 +0200
|
|
|
005971 |
+++ flite-1.3-release-mod/lib/Makefile 2006-11-12 12:17:40.000000000 +0200
|
|
|
005971 |
@@ -0,0 +1,73 @@
|
|
|
005971 |
+###########################################################################
|
|
|
005971 |
+## ##
|
|
|
005971 |
+## Language Technologies Institute ##
|
|
|
005971 |
+## Carnegie Mellon University ##
|
|
|
005971 |
+## Copyright (c) 1999 ##
|
|
|
005971 |
+## All Rights Reserved. ##
|
|
|
005971 |
+## ##
|
|
|
005971 |
+## Permission is hereby granted, free of charge, to use and distribute ##
|
|
|
005971 |
+## this software and its documentation without restriction, including ##
|
|
|
005971 |
+## without limitation the rights to use, copy, modify, merge, publish, ##
|
|
|
005971 |
+## distribute, sublicense, and/or sell copies of this work, and to ##
|
|
|
005971 |
+## permit persons to whom this work is furnished to do so, subject to ##
|
|
|
005971 |
+## the following conditions: ##
|
|
|
005971 |
+## 1. The code must retain the above copyright notice, this list of ##
|
|
|
005971 |
+## conditions and the following disclaimer. ##
|
|
|
005971 |
+## 2. Any modifications must be clearly marked as such. ##
|
|
|
005971 |
+## 3. Original authors' names are not deleted. ##
|
|
|
005971 |
+## 4. The authors' names are not used to endorse or promote products ##
|
|
|
005971 |
+## derived from this software without specific prior written ##
|
|
|
005971 |
+## permission. ##
|
|
|
005971 |
+## ##
|
|
|
005971 |
+## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ##
|
|
|
005971 |
+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ##
|
|
|
005971 |
+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ##
|
|
|
005971 |
+## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ##
|
|
|
005971 |
+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ##
|
|
|
005971 |
+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ##
|
|
|
005971 |
+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ##
|
|
|
005971 |
+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ##
|
|
|
005971 |
+## THIS SOFTWARE. ##
|
|
|
005971 |
+## ##
|
|
|
005971 |
+###########################################################################
|
|
|
005971 |
+## ##
|
|
|
005971 |
+## FLITE libraries ##
|
|
|
005971 |
+## ##
|
|
|
005971 |
+###########################################################################
|
|
|
005971 |
+TOP=..
|
|
|
005971 |
+DIRNAME=lib
|
|
|
005971 |
+BUILD_DIRS =
|
|
|
005971 |
+ALL_DIRS=
|
|
|
005971 |
+FILES = Makefile
|
|
|
005971 |
+LIBNAMES = flite flite_cmulex flite_usenglish \
|
|
|
005971 |
+ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb
|
|
|
005971 |
+
|
|
|
005971 |
+STATICLIBS= $(LIBNAMES:%=lib%.a)
|
|
|
005971 |
+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a)
|
|
|
005971 |
+#SHAREDLIBS = $(LIBNAMES:%=lib%.so)
|
|
|
005971 |
+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
|
|
|
005971 |
+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
|
|
|
005971 |
+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
|
|
|
005971 |
+ALL_LIBS = $(SHAREDLIBS) $(VERSIONSHAREDLIBS)
|
|
|
005971 |
+
|
|
|
005971 |
+ALL = shared_libs
|
|
|
005971 |
+
|
|
|
005971 |
+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION}
|
|
|
005971 |
+
|
|
|
005971 |
+include $(TOP)/config/common_make_rules
|
|
|
005971 |
+
|
|
|
005971 |
+ifdef SHFLAGS
|
|
|
005971 |
+shared_libs: $(SHAREDLIBS)
|
|
|
005971 |
+libflite_LDLIBS = -lm $(AUDIOLIBS)
|
|
|
005971 |
+libflite_cmulex_LDLIBS = -lflite
|
|
|
005971 |
+libflite_usenglish_LDLIBS = -lflite
|
|
|
005971 |
+libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish
|
|
|
005971 |
+libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish
|
|
|
005971 |
+libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
|
|
|
005971 |
+else
|
|
|
005971 |
+shared_libs: nothing
|
|
|
005971 |
+endif
|
|
|
005971 |
+
|
|
|
005971 |
+install:
|
|
|
005971 |
+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
|
|
|
005971 |
+
|
|
|
005971 |
diff -uNr flite-1.3-release/main/Makefile flite-1.3-release-mod/main/Makefile
|
|
|
005971 |
--- flite-1.3-release/main/Makefile 2005-08-08 00:38:42.000000000 +0200
|
|
|
005971 |
+++ flite-1.3-release-mod/main/Makefile 2006-11-12 11:44:46.000000000 +0200
|
|
|
005971 |
@@ -50,11 +50,11 @@
|
|
|
005971 |
|
|
|
005971 |
flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX)
|
|
|
005971 |
flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
|
|
|
005971 |
-flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
|
|
|
005971 |
+flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so)
|
|
|
005971 |
|
|
|
005971 |
flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX)
|
|
|
005971 |
flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
|
|
|
005971 |
-flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
|
|
|
005971 |
+flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so)
|
|
|
005971 |
|
|
|
005971 |
include $(TOP)/config/common_make_rules
|
|
|
005971 |
|
|
|
005971 |
diff -uNr flite-1.3-release/Makefile flite-1.3-release-mod/Makefile
|
|
|
005971 |
--- flite-1.3-release/Makefile 2005-11-01 15:40:45.000000000 +0200
|
|
|
005971 |
+++ flite-1.3-release-mod/Makefile 2006-11-12 11:44:46.000000000 +0200
|
|
|
005971 |
@@ -41,7 +41,7 @@
|
|
|
005971 |
###########################################################################
|
|
|
005971 |
TOP=.
|
|
|
005971 |
DIRNAME=
|
|
|
005971 |
-BUILD_DIRS = include src lang doc
|
|
|
005971 |
+BUILD_DIRS = include src lang lib doc
|
|
|
005971 |
ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm tools main
|
|
|
005971 |
CONFIG=configure configure.in config.sub config.guess \
|
|
|
005971 |
missing install-sh mkinstalldirs
|