Attachment #395476 for bug #538712

View | Details | Raw Unified | Return to bug 538712
Collapse All | Expand All

Lines 68-74 BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR) Link Here

(-)a/config/common_make_rules (-2 / +2 lines)
68		68
69	FLITELIBS = $(BUILDDIR)/lib/libflite.a	69	FLITELIBS = $(BUILDDIR)/lib/libflite.a
70	FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite	70	FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite
71	LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)	71	LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS)
72		72
73	FULLOBJS = $(OBJS:%=$(OBJDIR)/%)	73	FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
74	ifdef SHFLAGS	74	ifdef SHFLAGS
Lines 123-129 $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a Link Here
123	@ rm -rf shared_os && mkdir shared_os	123	@ rm -rf shared_os && mkdir shared_os
124	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}	124	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
125	@ (cd shared_os && ar x ../$<)	125	@ (cd shared_os && ar x ../$<)
126	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)	126	@ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS))
127	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )	127	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
128	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )	128	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
129	@ rm -rf shared_os	129	@ rm -rf shared_os




	$(TOP)/tools/make_voice_list $(VOICES)
	rm -f flite_voice_list.o
	$(MAKE) flite_voice_list.o
	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LDLIBS)

$(BINDIR)/flite_time$(EXEEXT): flite_time_main.o $(flite_time_LIBS_deps)
	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_time_main.o $(flite_time_LIBS_flags) $(FLITELIBFLAGS) $(LDLIBS) 

$(BINDIR)/t2p$(EXEEXT): t2p_main.o $(flite_LIBS_deps)
	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ t2p_main.o $(flite_LIBS_flags) $(LDLIBS)


$(BINDIR)/compile_regexes$(EXEEXT): compile_regexes.o $(FLITELIBS)
	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ compile_regexes.o $(FLITELIBFLAGS) $(LDLIBS)

each:
	@ for i in $(VOICES) ; \

	$(TOP)/tools/make_voice_list $(VOICE)
	rm -f flite_voice_list.o
	$(MAKE) flite_voice_list.o
	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LDLIBS)

install:
#       The basic binaries

Lines 71-75 MAIN_O = $(SRCS:%=%_main.o) Link Here

(-)a/testsuite/Makefile (-1 / +1 lines)
71	$(MAIN_O) : %_main.o : %_main.c	71	$(MAIN_O) : %_main.o : %_main.c
72	$(CC) $(CFLAGS) -o $@ $<	72	$(CC) $(CFLAGS) -o $@ $<
73	$(ALL) : %$(EXEEXT) : %_main.o $(FLITELIBS)	73	$(ALL) : %$(EXEEXT) : %_main.o $(FLITELIBS)
74	$(CC) $(CFLAGS) -o $@ $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) $(LDFLAGS)	74	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) $(LDLIBS)
75		75

Lines 62-70 include $(TOP)/config/common_make_rules Link Here

(-)a/tools/Makefile (-2 / +2 lines)
62	LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort	62	LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort
63		63
64	$(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS)	64	$(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS)
65	$(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS)	65	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS)
66	$(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS)	66	$(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS)
67	$(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS)	67	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS)
68	makescripts:	68	makescripts:
69	@ cp -p $(SCRIPTS) $(TOP)/bin	69	@ cp -p $(SCRIPTS) $(TOP)/bin
70		70

Lines 103-109 $(VOICENAME)_mcep.o: $(VOICENAME)_mcep.c Link Here

(-)a/tools/Makefile.flite (-1 / +1 lines)
103	$(CC) -I. -I$(FLITEDIR)/include -c -o $@ $<	103	$(CC) -I. -I$(FLITEDIR)/include -c -o $@ $<
104		104
105	flite_$(VOICENAME): flite_main.o flite_voice_list.o $(FLITELIBS) lib$(VOICENAME).a	105	flite_$(VOICENAME): flite_main.o flite_voice_list.o $(FLITELIBS) lib$(VOICENAME).a
106	$(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o $(LOCAL_LIBS) $(LOCAL_LANGLEX_LIBS) $(FLITELIBFLAGS) $(LDFLAGS)	106	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_main.o flite_voice_list.o $(LOCAL_LIBS) $(LOCAL_LANGLEX_LIBS) $(FLITELIBFLAGS) $(LDLIBS)
107		107
108	.build_lib: $(OBJS)	108	.build_lib: $(OBJS)
109	@ $(AR) cruv $(LIBDIR)/lib$(VOICENAME).a $(OBJS)	109	@ $(AR) cruv $(LIBDIR)/lib$(VOICENAME).a $(OBJS)

Lines 83-89 ALL = flowm.exe Link Here

(-)a/wince/Makefile (-1 / +1 lines)
83	include $(TOP)/config/common_make_rules	83	include $(TOP)/config/common_make_rules
84		84
85	flowm.exe: $(OBJS) $(H) flowm.rsc $(FLITELIBS) $(flite_LIBS_deps)	85	flowm.exe: $(OBJS) $(H) flowm.rsc $(FLITELIBS) $(flite_LIBS_deps)
86	$(CC) $(CFLAGS) -o $@ $(OBJS) flowm.rsc $(voice_LIBS_flags) $(flite_LIBS_flags) $(LDFLAGS) $(wince_LIBS)	86	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ $(OBJS) flowm.rsc $(voice_LIBS_flags) $(flite_LIBS_flags) $(LDLIBS) $(wince_LIBS)
87	$(STRIP) flowm.exe	87	$(STRIP) flowm.exe
88	$(SIZE) flowm.exe	88	$(SIZE) flowm.exe
89		89

Return to bug 538712

Lines 87-103 $(BINDIR)/flite$(EXEEXT): flite_main.o $(flite_LIBS_deps) Link Here

(-)a/main/Makefile (-5 / +5 lines)
87	$(TOP)/tools/make_voice_list $(VOICES)	87	$(TOP)/tools/make_voice_list $(VOICES)
88	rm -f flite_voice_list.o	88	rm -f flite_voice_list.o
89	$(MAKE) flite_voice_list.o	89	$(MAKE) flite_voice_list.o
90	$(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LDFLAGS)	90	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LDLIBS)
91		91
92	$(BINDIR)/flite_time$(EXEEXT): flite_time_main.o $(flite_time_LIBS_deps)	92	$(BINDIR)/flite_time$(EXEEXT): flite_time_main.o $(flite_time_LIBS_deps)
93	$(CC) $(CFLAGS) -o $@ flite_time_main.o $(flite_time_LIBS_flags) $(FLITELIBFLAGS) $(LDFLAGS)	93	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_time_main.o $(flite_time_LIBS_flags) $(FLITELIBFLAGS) $(LDLIBS)
94		94
95	$(BINDIR)/t2p$(EXEEXT): t2p_main.o $(flite_LIBS_deps)	95	$(BINDIR)/t2p$(EXEEXT): t2p_main.o $(flite_LIBS_deps)
96	$(CC) $(CFLAGS) -o $@ t2p_main.o $(flite_LIBS_flags) $(LDFLAGS)	96	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ t2p_main.o $(flite_LIBS_flags) $(LDLIBS)
97		97
98		98
99	$(BINDIR)/compile_regexes$(EXEEXT): compile_regexes.o $(FLITELIBS)	99	$(BINDIR)/compile_regexes$(EXEEXT): compile_regexes.o $(FLITELIBS)
100	$(CC) $(CFLAGS) -o $@ compile_regexes.o $(FLITELIBFLAGS) $(LDFLAGS)	100	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ compile_regexes.o $(FLITELIBFLAGS) $(LDLIBS)
101		101
102	each:	102	each:
103	@ for i in $(VOICES) ; \	103	@ for i in $(VOICES) ; \
Lines 109-115 $(BINDIR)/flite_${VOICE}: flite_main.o $(flite_LIBS_deps) Link Here
109	$(TOP)/tools/make_voice_list $(VOICE)	109	$(TOP)/tools/make_voice_list $(VOICE)
110	rm -f flite_voice_list.o	110	rm -f flite_voice_list.o
111	$(MAKE) flite_voice_list.o	111	$(MAKE) flite_voice_list.o
112	$(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LDFLAGS)	112	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LDLIBS)
113		113
114	install:	114	install:
115	# The basic binaries	115	# The basic binaries