[patch] fix the Makefile for linux-outloud

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

Hi Raman,

here is a patch for the linux-outloud makefile.  This patch removes
libtool and adds support for DESTDIR to the install target.

This patch, as well as the previous one I sent, also allows changing the
version of tcl the servers link against.  The earliest version of tcl
that is supported is 8.4.

I do not have the viavoice software, so I am unable to test the server.
Can someone who uses it please test by rebuilding it with this makefile?

Please let me know what you think.

William

Index: Makefile
===================================================================
--- Makefile	(revision 6204)
+++ Makefile	(working copy)
@@ -1,42 +1,28 @@
 #$Id$
-CC=g++
+
 INSTALL = install
 PREFIX = /usr
-libparentdir = ${PREFIX}/share/emacs/site-lisp
-libdir =$(libparentdir)/emacspeak/servers/linux-outloud
+LIBPARENTDIR = ${PREFIX}/share/emacs/site-lisp
+LIBDIR =$(LIBPARENTDIR)/emacspeak/servers/linux-outloud
 
-CFLAGS= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall  -Wno-long-long -I/usr/include/tcl8.4
-LIBS= -ltcl8.4 -ltclx8.4 -ldl    
+TCL_VERSION=8.4
+TCL_INCLUDE=/usr/include/tcl$(TCL_VERSION)
+CFLAGS= -g    -O2 -fPIC  -DPIC  -pedantic -ansi -Wall  -Wno-long-long -I$(TCL_INCLUDE)
+CXXFLAGS= $(CFLAGS)
+LIBS= -ltcl$(TCL_VERSION) -ldl    
 
-ATTS=atcleci.cpp  ALSA asoundrc
-MISC=alsaparams.c
 all:   atcleci.so
 
-langswitch.lo: langswitch.cpp
-	libtool --mode=compile $(CC) $(CFLAGS) -c $<
+atcleci.so: langswitch.o atcleci.o
+	$(CXX) -shared -o $@ langswitch.o atcleci.o $(LIBS)
 
-atcleci.lo: atcleci.cpp
-	libtool --mode=compile $(CC) $(CFLAGS) -c $<
+alsaparams: alsaparams.c
+	$(CC) $(CFLAGS) -o $@ $<  -lasound 
 
-libatcleci.la: atcleci.lo langswitch.lo
-	libtool --mode=link $(CC) $(CFLAGS) -g -o $@ $^ -lasound $(LIBS) -rpath /usr/local/lib -shared
-
-.libs/libatcleci.so: libatcleci.la
-
-atcleci.so: .libs/libatcleci.so
-			cp -H $< $@
-
-alsaparams.o: alsaparams.c
-	libtool --mode=compile $(CC) $(CFLAGS) -c $<
-
-alsaparams: alsaparams.o
-	libtool --mode=link $(CC) $(CFLAGS) -g -o $@ $<  -lasound 
 clean:
-	rm -f *.so *.la *.o *.lo \
-atcleci.so atcleci.o atcleci.lo
-	rm -rf .libs
+	rm -f *.so *.o 
 
 install: atcleci.so
-	if test ! -d $(libdir) ; then mkdir $(libdir); fi ; \
-	chmod 755 $(libdir); \
-	$(INSTALL) -m 0644  $(ATTS) $(libdir)
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+	$(INSTALL) $< $(DESTDIR)$(LIBDIR)
+

Attachment: pgpgeQwkBnYrM.pgp
Description: PGP signature