Skip to content

Commit

Permalink
go back to just using a makefile
Browse files Browse the repository at this point in the history
The reason I went to autotools was the multiple sound systems, but since
we are now just using espeak's audio processing we can go back to a more
simple build system.
  • Loading branch information
williamh committed Mar 6, 2011
1 parent 7bf2eee commit 701074f
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 108 deletions.
12 changes: 1 addition & 11 deletions .gitignore
@@ -1,14 +1,4 @@
.deps
aclocal.m4
autom4te.cache
config.*
configure
depcomp
espeakup
install-sh
Makefile
Makefile.in
missing
stamp-h1
*.d
*.o
*.swp
40 changes: 40 additions & 0 deletions Makefile
@@ -0,0 +1,40 @@
PREFIX = /usr/local
BINDIR = ${PREFIX}/bin
MANDIR = ${PREFIX}/share/man

DEPFLAGS = -MMD
WARNFLAGS = -Wall
CFLAGS += ${DEPFLAGS} ${WARNFLAGS}

LDLIBS = -lespeak -lpthread

INSTALL = install
BINMODE = 0755
MANMODE = 0644

SRCS = cli.c \
espeak.c \
espeakup.c \
queue.c \
signal.c \
softsynth.c

OBJS = ${SRCS:.c=.o}

all: espeakup

install: espeakup
${INSTALL} -d ${DESTDIR}${BINDIR}
${INSTALL} -m ${BINMODE} $< ${DESTDIR}${BINDIR}
${INSTALL} -d ${DESTDIR}${MANDIR}/man8
${INSTALL} -m 644 espeakup.8 ${DESTDIR}${MANDIR}/man8

espeakup: ${OBJS}

clean:
${RM} *.d *.o

distclean: clean
${RM} espeakup

-include ${SRCS:.c=.d}
8 changes: 0 additions & 8 deletions Makefile.am

This file was deleted.

16 changes: 3 additions & 13 deletions README
Expand Up @@ -19,19 +19,9 @@ Installation

The preferred way to install espeakup is using your distribution's
packaging system, but if your distribution does not have a package for
espeakup yet, here are some basic instructions.

Espeakup uses an autotools build system, so installation should be very
straight forward.

If you are installing from git, you must have at least automake 1.11.1
and autoconf 2.65 installed. Then, change to the repository directory
and type:

autoreconf -i

If this runs successfully, you will have a configure script, so run it
then run make. If that completes successfully, run make install.
espeakup yet, espeakup just uses a Makefile, so you should be able to
change to the source directory, then type make, then as root, make
install.

Starting Up
===========
Expand Down
6 changes: 1 addition & 5 deletions cli.c
Expand Up @@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#include <getopt.h>
#include <stdio.h>
#include <stdlib.h>
Expand Down Expand Up @@ -54,7 +50,7 @@ static void show_help()

static void show_version(void)
{
printf("%s\n", PACKAGE_STRING);
printf("ESpeakup %s\n", PACKAGE_VERSION);
printf("Copyright (C) 2008 William Hubbs\n");
printf("License GPLv3+: GNU GPL version 3 or later\n");
printf("You are free to change and redistribute this software.\n");
Expand Down
51 changes: 0 additions & 51 deletions configure.ac

This file was deleted.

4 changes: 0 additions & 4 deletions espeak.c
Expand Up @@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
Expand Down
4 changes: 0 additions & 4 deletions espeakup.c
Expand Up @@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#include <errno.h>
#include <signal.h>
#include <stdio.h>
Expand Down
3 changes: 3 additions & 0 deletions espeakup.h
Expand Up @@ -28,6 +28,9 @@

#include "queue.h"

#define PACKAGE_VERSION "0.80-dev"
#define PACKAGE_BUGREPORT "http://github.com/williamh/espeakup/issues"

enum command_t {
CMD_SET_FREQUENCY,
CMD_SET_PITCH,
Expand Down
4 changes: 0 additions & 4 deletions queue.c
Expand Up @@ -21,10 +21,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
Expand Down
4 changes: 0 additions & 4 deletions signal.c
Expand Up @@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#include <signal.h>
#include <stdio.h>
#include <string.h>
Expand Down
4 changes: 0 additions & 4 deletions softsynth.c
Expand Up @@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
Expand Down

0 comments on commit 701074f

Please sign in to comment.