Home | History | Annotate | Download | only in patches
      1  15006  ww36193 --- espeak-1.37-source/src/Makefile-orig	2008-08-08 20:04:39.001556000 -0500
      2  15006  ww36193 +++ espeak-1.37-source/src/Makefile	2008-08-08 20:04:42.246443000 -0500
      3  15006  ww36193 @@ -15,7 +15,7 @@ LIB_VERSION = 1
      4  15006  ww36193  LIBTAG = $(LIB_VERSION).$(RELEASE)
      5  15006  ww36193  
      6  15006  ww36193  # Use SONAME_OPT=-Wl,h, on Solaris
      7  15006  ww36193 -SONAME_OPT=-Wl,-soname,
      8  15006  ww36193 +SONAME_OPT=-h 
      9  15006  ww36193  
     10  15006  ww36193  # Use EXTRA_LIBS=-lm on Solaris
     11  15006  ww36193  EXTRA_LIBS =
     12  15006  ww36193 @@ -60,15 +60,15 @@ libespeak_SOURCES = speak_lib.cpp compil
     13  15006  ww36193  
     14  15006  ww36193  SRCS1=$(speak_SOURCES)
     15  15006  ww36193  OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
     16  15006  ww36193 -LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
     17  15006  ww36193 +LIBS1=$(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
     18  15006  ww36193  
     19  15006  ww36193  SRCS2=$(libespeak_SOURCES)
     20  15006  ww36193  OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
     21  15006  ww36193 -LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
     22  15006  ww36193 +LIBS2=$(LIB_AUDIO) -lpthread
     23  15006  ww36193  
     24  15006  ww36193  SRCS3 = espeak.cpp
     25  15006  ww36193  OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
     26  15006  ww36193 -LIBS3=-lstdc++ -L . -lespeak
     27  15006  ww36193 +LIBS3=-L . -lespeak
     28  15006  ww36193  
     29  15006  ww36193  CXXFLAGS=-O2
     30  15006  ww36193  
     31  15006  ww36193 @@ -92,7 +92,7 @@ x_%.o: %.cpp
     32  15006  ww36193  	-I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
     33  15006  ww36193  
     34  15006  ww36193  $(LIB_NAME): $(OBJS2)
     35  15006  ww36193 -	$(CXX) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
     36  15006  ww36193 +	$(CXX) -G $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
     37  15006  ww36193  
     38  15006  ww36193  $(STATIC_LIB_NAME): $(OBJS2)
     39  15006  ww36193  	$(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)
     40