From ea185999421376b1716f869e51912e9fbfee3097 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Wed, 11 Sep 2013 14:12:30 +0100
Subject: [PATCH] Move the install and distclean fully to the root Makefile.am
 file.

---
 Makefile.am     | 29 +++++++++++++++++++++++++----
 src/Makefile.am | 25 -------------------------
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 23ae343f..344c3619 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,13 @@ LIBDIR=@libdir@
 DATADIR=$(PREFIX)/share/espeak-data
 
 PLATFORM=big_endian
+RELEASE=1.47
+LIB_VERSION=1
+LIBTAG=$(LIB_VERSION).$(RELEASE)
+
+INSTALL=install
+LN_SF=/bin/ln -sf
+MKDIR=mkdir -p
 
 .PHONY: all clean distclean espeak-phoneme-data
 
@@ -26,17 +33,31 @@ EXTRA_DIST += ChangeLog
 all: src/speak src/libespeak.so src/libespeak.a src/espeak src/espeakedit espeak-data/phontab dictionaries docs/speak_lib.h
 
 install:
-	cd src && make DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) BINDIR=$(BINDIR) INCDIR=$(INCDIR) LIBDIR=$(LIBDIR) install && cd ..
-	install -m 755 src/espeakedit $(DESTDIR)$(BINDIR)
+	rm -rf $(DESTDIR)$(DATADIR)
+	$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(MKDIR) $(DESTDIR)$(LIBDIR)
+	$(MKDIR) $(DESTDIR)$(INCDIR)
+	$(MKDIR) $(DESTDIR)$(DATADIR)
+	$(INSTALL) -m 755 src/espeak $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 755 src/espeakedit $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 755 src/libespeak.so.$(LIBTAG) $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -m 755 src/libespeak.a $(DESTDIR)$(LIBDIR)
+	$(LN_SF) libespeak.so.$(LIBTAG) $(DESTDIR)$(LIBDIR)/libespeak.so.$(LIB_VERSION)
+	$(LN_SF) libespeak.so.$(LIB_VERSION) $(DESTDIR)$(LIBDIR)/libespeak.so
+	$(INSTALL) -pm 644 src/speak_lib.h $(DESTDIR)$(INCDIR)
+	cp -prf espeak-data/* $(DESTDIR)$(DATADIR)
 
 clean:
 	cd src && rm -f *.o *~ && cd ..
 
 distclean: clean
-	cd src && make distclean && cd ..
+	rm -f src/speak
+	rm -f src/espeak
+	rm -f src/espeakedit
+	rm -f src/libespeak.*
 	cd platforms/$(PLATFORM) && rm -f espeak-phoneme-data && cd ../..
 	rm -rf espeak-data/dictsource espeak-data/phsource espeak-data/phondata-manifest
-	cd espeak-data && rm -f *_dict && cd ..
+	rm -f espeak-data/*_dict
 
 ##### build targets:
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d725e11..f2e85a14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -123,28 +123,3 @@ espeakedit_LIBS=-lstdc++ $(LIB_AUDIO)
 espeakedit_CXXFLAGS = ${WX_CXXFLAGS} -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
 $(ESPEAKEDIT): $(espeakedit_OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(espeakedit_OBJS) $(espeakedit_LIBS) ${WX_LIBS}
-
-clean:
-	rm -f *.o *.a *~
-
-distclean: clean
-	rm -f $(SPEAK)
-	rm -f $(ESPEAK)
-	rm -f $(LIBESPEAK)*
-	rm -f $(STATIC_LIBESPEAK)
-	rm -f $(ESPEAKEDIT)
-
-install:
-	rm -rf $(DESTDIR)$(DATADIR)
-	$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(MKDIR) $(DESTDIR)$(LIBDIR)
-	$(MKDIR) $(DESTDIR)$(INCDIR)
-	$(MKDIR) $(DESTDIR)$(DATADIR)
-	$(INSTALL) -m 755 $(ESPEAK) $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 755 $(LIBESPEAK).$(LIBTAG) $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -m 755 $(STATIC_LIBESPEAK) $(DESTDIR)$(LIBDIR)
-	$(LN_SF) $(LIBESPEAK).$(LIBTAG) $(DESTDIR)$(LIBDIR)/$(LIBESPEAK).$(LIB_VERSION)
-	$(LN_SF) $(LIBESPEAK).$(LIB_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBESPEAK)
-	$(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR)
-	cp -prf ../espeak-data/* $(DESTDIR)$(DATADIR)
-