| 158879ad |
1 | --- flite-1.2-release/config/common_make_rules..mk 2003-02-18 19:17:21 +0300 |
| 2 | +++ flite-1.2-release/config/common_make_rules 2006-04-10 01:13:53 +0400 |
| 3 | @@ -52,7 +52,14 @@ |
| 4 | LIBDIR=$(TOP)/lib |
| 5 | |
| 6 | FLITELIBS = $(TOP)/lib/libflite.a |
| 7 | -LDFLAGS += -L$(TOP)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS) |
| 8 | +LDFLAGS += -L$(TOP)/lib -lflite $(OTHERLIBS) |
| 9 | + |
| 10 | +flite_LDLIBS = $(AUDIOLIBS) -lm |
| 11 | +flite_cmulex_LDLIBS = -lflite |
| 12 | +flite_usenglish_LDLIBS = -lflite |
| 13 | +flite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish |
| 14 | +flite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish |
| 15 | +flite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish |
| 16 | |
| 17 | ifdef SHFLAGS |
| 18 | SOOBJS = $(OBJS:.o=.os) |
| 19 | @@ -88,7 +95,7 @@ |
| 20 | @ rm -rf shared_os && mkdir shared_os |
| 21 | @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} |
| 22 | @ (cd shared_os && ar x ../$<) |
| 23 | - @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) |
| 24 | + @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -Wl,-rpath-link -Wl,../ -L../ -o ../$@.${PROJECT_VERSION} *.os $($(@:lib%.so=%_LDLIBS))) |
| 25 | @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} |
| 26 | @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ |
| 27 | @ rm -rf shared_os |
| 28 | --- flite-1.2-release/doc/Makefile..mk 2002-12-30 15:57:30 +0300 |
| 29 | +++ flite-1.2-release/doc/Makefile 2006-04-10 01:12:41 +0400 |
| 30 | @@ -40,7 +40,7 @@ |
| 31 | ALL_DIRS= |
| 32 | FILES = Makefile flite.texi intro.txt alice stuff.ed |
| 33 | |
| 34 | -ALL = |
| 35 | +ALL = flite.html |
| 36 | |
| 37 | include $(TOP)/config/common_make_rules |
| 38 | |
| 39 | --- flite-1.2-release/main/Makefile..mk 2003-02-20 01:17:31 +0300 |
| 40 | +++ flite-1.2-release/main/Makefile 2006-04-10 01:12:41 +0400 |
| 41 | @@ -49,11 +49,11 @@ |
| 42 | $(BINDIR)/t2p$(EXEEXT) |
| 43 | |
| 44 | flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX) |
| 45 | -flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) |
| 46 | +flite_LIBS_flags = -L$(LIBDIR) -Wl,-rpath-link -Wl,$(LIBDIR) $(flite_LIBS:%=-l%) |
| 47 | flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) |
| 48 | |
| 49 | flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX) |
| 50 | -flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%) |
| 51 | +flite_time_LIBS_flags = -L$(LIBDIR) -Wl,-rpath-link -Wl,$(LIBDIR) $(flite_time_LIBS:%=-l%) |
| 52 | flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a) |
| 53 | |
| 54 | include $(TOP)/config/common_make_rules |
| 55 | --- flite-1.2-release/Makefile..mk 2003-02-17 18:14:05 +0300 |
| 56 | +++ flite-1.2-release/Makefile 2006-04-10 01:15:02 +0400 |
| 57 | @@ -41,7 +41,7 @@ |
| 58 | ########################################################################### |
| 59 | TOP=. |
| 60 | DIRNAME=. |
| 61 | -BUILD_DIRS = include src lang lib tools doc main |
| 62 | +BUILD_DIRS = include src lang lib main doc |
| 63 | ALL_DIRS=config $(BUILD_DIRS) testsuite sapi |
| 64 | CONFIG=configure configure.in config.sub config.guess \ |
| 65 | missing install-sh mkinstalldirs |
projects / packages / flite.git / blame