[updated patch] fix makefile for linux-outloud

[William Hubbs <w.d.hubbs@xxxxxxxxxxx>]

Hello again Raman and all,

here is the fixed patch for the makefile; please disregard the earlier
one I sent.

Thanks.

William

Index: Makefile
===================================================================
--- Makefile	(revision 6204)
+++ Makefile	(working copy)
@@ -1,38 +1,26 @@
 #$Id: Makefile 6198 2009-08-25 15:19:03Z tv.raman.tv $
-CC=g++
+
 INSTALL = install
 PREFIX = /usr
-libparentdir = ${PREFIX}/share/emacs/site-lisp
-libdir =$(libparentdir)/emacspeak/servers/linux-espeak
-INCLUDE= -I/usr/include/tcl8.4 -I/usr/include/espeak
-CFLAGS= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall -Wno-long-long $(INCLUDE)
+LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
+LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-espeak
+TCL_VERSION = 8.4
+TCL_INCLUDE= /usr/include/tcl$(TCL_VERSION)
+CXXFLAGS+= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall -Wno-long-long -I$(TCL_INCLUDE)
 
-LIBS= -ltcl8.4 -ltclx8.4 -lespeak
+LIBS= -ltcl$(TCL_VERSION) -lespeak
 
-TTS=tclespeak.cpp
+TTS=tclespeak.so
 
-all:   tclespeak.so
+all:   $(TTS)
 
+$(TTS): tclespeak.o
+	$(CXX) -shared -o $@ $< $(LIBS)
 
-	
-
-tclespeak.lo: tclespeak.cpp
-	libtool --mode=compile $(CC) $(CFLAGS) -c $<
-
-libtclespeak.la: tclespeak.lo 
-	libtool --mode=link $(CC) $(CFLAGS) -g -o $@ $^  $(LIBS) -rpath /usr/local/lib -shared
-
-.libs/libtclespeak.so: libtclespeak.la
-
-tclespeak.so: .libs/libtclespeak.so
-			cp -H $< $@
-
 clean:
-	rm -f *.so *.la *.o *.lo \
-tclespeak.so tclespeak.o tclespeak.lo
-	rm -rf .libs
+	rm -f *.so *.o
 
-install: tclespeak.so
-	if test ! -d $(libdir) ; then mkdir $(libdir); fi ; \
-	chmod 755 $(libdir); \
-	$(INSTALL) -m 0644  $(TTS) $(libdir)
+install: $(TTS)
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+	$(INSTALL) $< $(DESTDIR)$(LIBDIR)
+

Attachment: pgpoy4SD5VonS.pgp
Description: PGP signature