Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/espeak-01-makefile.diff
author wwalker
Mon, 18 Aug 2008 14:18:12 +0000
changeset 1318 12cb6b42e660
parent 1308 ed0b1d282d8c
permissions -rw-r--r--
Make sure SONAME is set/used when building eSpeak shared library.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1308
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
     1
 
--- espeak-1.37-source/src/Makefile-orig	2008-08-08 20:04:39.001556000 -0500
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
     2
 
+++ espeak-1.37-source/src/Makefile	2008-08-08 20:04:42.246443000 -0500
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
     3
 
@@ -15,7 +15,7 @@ LIB_VERSION = 1
1002
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
 
 LIBTAG = $(LIB_VERSION).$(RELEASE)
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     5
1308
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
     6
 
 # Use SONAME_OPT=-Wl,h, on Solaris
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
     7
 
-SONAME_OPT=-Wl,-soname,
1318
12cb6b42e660 Make sure SONAME is set/used when building eSpeak shared library.
wwalker
parents: 1308
diff changeset 
     8
 
+SONAME_OPT=-h
1002
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
1308
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    10
 
 # Use EXTRA_LIBS=-lm on Solaris
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    11
 
 EXTRA_LIBS =
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    12
 
@@ -60,15 +60,15 @@ libespeak_SOURCES = speak_lib.cpp compil
1002
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    13
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    14
 
 SRCS1=$(speak_SOURCES)
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    15
 
 OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
1308
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    16
 
-LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    17
 
+LIBS1=$(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
1002
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    18
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    19
 
 SRCS2=$(libespeak_SOURCES)
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    20
 
 OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
1308
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    21
 
-LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    22
 
+LIBS2=$(LIB_AUDIO) -lpthread
1002
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    23
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    24
 
 SRCS3 = espeak.cpp
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    25
 
 OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
1308
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    26
 
-LIBS3=-lstdc++ -L . -lespeak
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    27
 
+LIBS3=-L . -lespeak
1002
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    28
1308
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    29
 
 CXXFLAGS=-O2
1002
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    30
1308
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    31
 
@@ -92,7 +92,7 @@ x_%.o: %.cpp
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    32
 
 	-I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
1002
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    33
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    34
 
 $(LIB_NAME): $(OBJS2)
1308
ed0b1d282d8c Port eSpeak to SunStudio from gcc
wwalker
parents: 1002
diff changeset 
    35
 
-	$(CXX) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
1318
12cb6b42e660 Make sure SONAME is set/used when building eSpeak shared library.
wwalker
parents: 1308
diff changeset 
    36
 
+	$(CXX) -G $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
1002
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    37
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    38
 
 $(STATIC_LIB_NAME): $(OBJS2)
601040dd2efb 2008-03-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    39
 
 	$(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)
upstream/spec-files-extra