Blame SOURCES/festival-1.96-main-shared-build.patch
|
 |
23ca74 |
--- festival/speech_tools/config/rules/defaults.mak.orig 2007-03-16 12:39:12.000000000 -0400
|
|
|
23ca74 |
+++ festival/speech_tools/config/rules/defaults.mak 2007-03-16 12:39:19.000000000 -0400
|
|
|
23ca74 |
@@ -69,15 +69,21 @@
|
|
|
23ca74 |
MADE_FROM_ABOVE:=$(N)
|
|
|
23ca74 |
endif
|
|
|
23ca74 |
|
|
|
23ca74 |
+ifneq ($(SHARED),0)
|
|
|
23ca74 |
+ LIBTYPE=so
|
|
|
23ca74 |
+else
|
|
|
23ca74 |
+ LIBTYPE=a
|
|
|
23ca74 |
+endif
|
|
|
23ca74 |
+
|
|
|
23ca74 |
ifndef PROJECT_LIBDEPS
|
|
|
23ca74 |
- PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).a)
|
|
|
23ca74 |
+ PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
|
|
|
23ca74 |
endif
|
|
|
23ca74 |
ifndef PROJECT_LIBS
|
|
|
23ca74 |
PROJECT_LIBS = $(foreach l,$(PROJECT_LIBRARIES),-L$(PROJECT_LIBRARY_DIR_$(l)) -l$(l))
|
|
|
23ca74 |
endif
|
|
|
23ca74 |
|
|
|
23ca74 |
ifndef REQUIRED_LIBDEPS
|
|
|
23ca74 |
- REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).a)
|
|
|
23ca74 |
+ REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
|
|
|
23ca74 |
endif
|
|
|
23ca74 |
ifndef REQUIRED_LIBS
|
|
|
23ca74 |
REQUIRED_LIBS = $(foreach l,$(REQUIRED_LIBRARIES),-L$(REQUIRED_LIBRARY_DIR_$(l)) -l$(l))
|
|
|
23ca74 |
--- festival/config/project.mak.orig 2007-03-16 13:01:40.000000000 -0400
|
|
|
23ca74 |
+++ festival/config/project.mak 2007-03-16 13:02:24.000000000 -0400
|
|
|
23ca74 |
@@ -84,6 +84,8 @@
|
|
|
23ca74 |
PROJECT_LIBRARY_DIR_Festival = $(TOP)/src/lib
|
|
|
23ca74 |
PROJECT_DEFAULT_LIBRARY = Festival
|
|
|
23ca74 |
|
|
|
23ca74 |
+PROJECT_LIBRARY_VERSION_Festival = $(PROJECT_VERSION).0
|
|
|
23ca74 |
+
|
|
|
23ca74 |
# Libraries used from other projects
|
|
|
23ca74 |
|
|
|
23ca74 |
REQUIRED_LIBRARIES = estools estbase eststring
|