projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate flite into aoview directly. Fix great circle computation.
[fw/altos]
/
aoview
/
Makefile.am
diff --git
a/aoview/Makefile.am
b/aoview/Makefile.am
index 28c3d646d96615651629df5ae5ad60d62958cb27..c354aa0f033d13197a00560105ae2bc787e9bde5 100644
(file)
--- a/
aoview/Makefile.am
+++ b/
aoview/Makefile.am
@@
-1,13
+1,9
@@
VERSION=$(shell git describe)
AM_CFLAGS=$(GNOME_CFLAGS) -I$(top_srcdir)/src -DAOVIEW_VERSION=\"$(VERSION)\" @FLITE_INCS@
VERSION=$(shell git describe)
AM_CFLAGS=$(GNOME_CFLAGS) -I$(top_srcdir)/src -DAOVIEW_VERSION=\"$(VERSION)\" @FLITE_INCS@
-if USE_FLITE
-FLITE_PROG=aoview_flite
-endif
+bin_PROGRAMS=aoview
-bin_PROGRAMS=aoview $(FLITE_PROG) aoview_slowtelem
-
-aoview_LDADD=$(GNOME_LIBS)
+aoview_LDADD=$(GNOME_LIBS) $(FLITE_LIBS)
aoview_SOURCES = \
aoview_main.c \
aoview_SOURCES = \
aoview_main.c \
@@
-25,16
+21,9
@@
aoview_SOURCES = \
aoview_voice.c \
aoview_replay.c \
aoview_label.c \
aoview_voice.c \
aoview_replay.c \
aoview_label.c \
+ aoview_flite.c \
aoview.h
aoview.h
-aoview_flite_SOURCES = \
- aoview_flite.c
-
-aoview_slowtelem_SOURCES = \
- aoview_slowtelem.c
-
-aoview_flite_LDADD=@FLITE_LIBS@
-
BUILT_SOURCES = aoview_glade.h
CLEANFILES = aoview_glade.h
BUILT_SOURCES = aoview_glade.h
CLEANFILES = aoview_glade.h