blob: f9295fb853b70a25218dc52d124c2285c871463c (
plain)
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
|
diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/config/common_make_rules
--- flite-1.4-release/config/common_make_rules 2009-07-30 14:52:56.000000000 +0000
+++ flite-1.4-release.new/config/common_make_rules 2011-03-26 20:22:59.000000000 +0000
@@ -68,7 +68,7 @@
FLITELIBS = $(BUILDDIR)/lib/libflite.a
FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite
-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)
+LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS)
FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
ifdef SHFLAGS
@@ -123,7 +123,7 @@
@ rm -rf shared_os && mkdir shared_os
@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
@ (cd shared_os && ar x ../$<)
- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
+ @ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS))
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
@ rm -rf shared_os
--- flite-1.4-release/tools/Makefile~ 2009-08-22 20:19:01.000000000 +0100
+++ flite-1.4-release.new/tools/Makefile 2013-01-20 20:06:34.259527220 +0000
@@ -62,9 +62,9 @@
LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort
$(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS)
- $(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS)
+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS)
$(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS)
- $(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS)
+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS)
makescripts:
@ cp -p $(SCRIPTS) $(TOP)/bin
|