summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-05 22:02:55 (UTC)
committer mickeyl <mickeyl>2005-05-05 22:02:55 (UTC)
commitfdd31c3dd95a42d2666235ad8c2478b7ceead261 (patch) (unidiff)
treedf6cf67018891193b642f4e1f2d28a4263502a4a
parent548bfb68e473add1a19d3dd861fc1785f5e6b5c0 (diff)
downloadopie-fdd31c3dd95a42d2666235ad8c2478b7ceead261.zip
opie-fdd31c3dd95a42d2666235ad8c2478b7ceead261.tar.gz
opie-fdd31c3dd95a42d2666235ad8c2478b7ceead261.tar.bz2
use dependency system for flite plugins
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--dependencies.in14
-rw-r--r--noncore/apps/opie-reader/FliteDyn/FliteDyn.pro10
-rw-r--r--noncore/apps/opie-reader/FliteDyn/config.in5
-rw-r--r--noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro12
-rw-r--r--noncore/apps/opie-reader/FliteDyn16/config.in4
5 files changed, 40 insertions, 5 deletions
diff --git a/dependencies.in b/dependencies.in
index 4c758d3..70619de 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -15,25 +15,25 @@
15 default "n" 15 default "n"
16 16
17 config LIBPCAP_LIB_DIR 17 config LIBPCAP_LIB_DIR
18 string "LIBPCAP library dir" 18 string "LIBPCAP library dir"
19 depends LIBPCAP_DEP 19 depends LIBPCAP_DEP
20 20
21 config LIBPCAP_INC_DIR 21 config LIBPCAP_INC_DIR
22 string "LIBPCAP include dir" 22 string "LIBPCAP include dir"
23 depends LIBPCAP_DEP 23 depends LIBPCAP_DEP
24 24
25 config LIBSQLITE_DEP 25 config LIBSQLITE_DEP
26 boolean "Have sqlite >= 3.0.7" 26 boolean "Have sqlite >= 3.0.7"
27 default n 27 default "n"
28 28
29 config LIBSQLITE_LIB_DIR 29 config LIBSQLITE_LIB_DIR
30 string "LIBSQLITE library dir" 30 string "LIBSQLITE library dir"
31 depends LIBSQLITE_DEP 31 depends LIBSQLITE_DEP
32 32
33 config LIBSQLITE_INC_DIR 33 config LIBSQLITE_INC_DIR
34 string "LIBSQLITE include dir" 34 string "LIBSQLITE include dir"
35 depends LIBSQLITE_DEP 35 depends LIBSQLITE_DEP
36 36
37 config LIBXINE_DEP 37 config LIBXINE_DEP
38 boolean "Have libxine >= 1.0rc6" 38 boolean "Have libxine >= 1.0rc6"
39 default "n" 39 default "n"
@@ -93,12 +93,24 @@
93 config LIBBLUEZ_INC_DIR 93 config LIBBLUEZ_INC_DIR
94 string "libbluez include dir" 94 string "libbluez include dir"
95 depends LIBBLUEZ_DEP 95 depends LIBBLUEZ_DEP
96 96
97 config LIBFREETYPE2_DEP 97 config LIBFREETYPE2_DEP
98 boolean "Have freetype2" 98 boolean "Have freetype2"
99 default "n" 99 default "n"
100 100
101 config LIBFREETYPE2_INC_DIR 101 config LIBFREETYPE2_INC_DIR
102 string "freetype2 include dir" 102 string "freetype2 include dir"
103 depends LIBFREETYPE2_DEP 103 depends LIBFREETYPE2_DEP
104 104
105 config LIBFLITE_DEP
106 boolean "Have flite library"
107 default "n"
108
109 config LIBFLITE_INC_DIR
110 string "libflite include dir"
111 depends LIBFLITE_DEP
112
113 config LIBFLITE_LIB_DIR
114 string "libflite library dir"
115 depends LIBFLITE_DEP
116
diff --git a/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro b/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro
index 54927f5..5d03f91 100644
--- a/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro
+++ b/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro
@@ -1,18 +1,26 @@
1DEFINES += OPIE USEQPE 1DEFINES += OPIE USEQPE
2VPATH = .. 2VPATH = ..
3 TEMPLATE= lib 3 TEMPLATE= lib
4 CONFIG = qt warn_on release dll 4 CONFIG = qt warn_on release dll
5 HEADERS = flitedyn.h 5 HEADERS = flitedyn.h
6 6
7 SOURCES = flitedyn.cpp 7 SOURCES = flitedyn.cpp
8 8
9 9
10 INTERFACES= 10 INTERFACES=
11 DESTDIR = $(OPIEDIR)/plugins/reader/outcodecs 11 DESTDIR = $(OPIEDIR)/plugins/reader/outcodecs
12 TARGET = flitedyn 12 TARGET = flitedyn
13LIBS += -L/home/tim/flite/flite-1.2-release/lib -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex -lflite 13LIBS += -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex -lflite
14 14
15 INCLUDEPATH+= $(OPIEDIR)/include 15 INCLUDEPATH+= $(OPIEDIR)/include
16DEPENDPATH += $(OPIEDIR)/include 16DEPENDPATH += $(OPIEDIR)/include
17 17
18include( $(OPIEDIR)/include.pro ) 18include( $(OPIEDIR)/include.pro )
19
20!isEmpty( LIBFLITE_INC_DIR ) {
21 INCLUDEPATH = $$LIBFLITE_INC_DIR $$INCLUDEPATH
22}
23!isEmpty( LIBFLITE_LIB_DIR ) {
24 LIBS = -L$$LIBFLITE_LIB_DIR $$LIBS
25}
26
diff --git a/noncore/apps/opie-reader/FliteDyn/config.in b/noncore/apps/opie-reader/FliteDyn/config.in
index 4a791f9..d2db3c3 100644
--- a/noncore/apps/opie-reader/FliteDyn/config.in
+++ b/noncore/apps/opie-reader/FliteDyn/config.in
@@ -1,4 +1,7 @@
1 config OPIE-READER-FLITEDYN 1 config OPIE-READER-FLITEDYN
2 boolean "opie-reader flite plugin (speech output via lib in 8kHz)" 2 boolean "opie-reader flite plugin (speech output via lib in 8kHz)"
3 default "n" 3 default "n"
4 depends OPIE-READER 4 depends OPIE-READER && LIBFLITE_DEP
5 comment "opie-reader flite plugin needs libflite"
6 depends !( OPIE-READER && LIBFLITE_DEP )
7
diff --git a/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro b/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro
index 0f92e49..9fb7a56 100644
--- a/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro
+++ b/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro
@@ -1,18 +1,28 @@
1DEFINES += OPIE USEQPE 1DEFINES += OPIE USEQPE
2VPATH = .. 2VPATH = ..
3 TEMPLATE= lib 3 TEMPLATE= lib
4 CONFIG = qt warn_on release dll 4 CONFIG = qt warn_on release dll
5 HEADERS = flitedyn.h 5 HEADERS = flitedyn.h
6 6
7 SOURCES = flitedyn.cpp 7 SOURCES = flitedyn.cpp
8 8
9 9
10 INTERFACES= 10 INTERFACES=
11 DESTDIR = $(OPIEDIR)/plugins/reader/outcodecs 11 DESTDIR = $(OPIEDIR)/plugins/reader/outcodecs
12 TARGET = flitedyn 12 TARGET = flitedyn
13LIBS += -L/home/tim/flite/flite-1.2-release/lib -lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite 13LIBS += -lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite
14 14
15 INCLUDEPATH+= $(OPIEDIR)/include 15 INCLUDEPATH+= $(OPIEDIR)/include
16DEPENDPATH += $(OPIEDIR)/include 16DEPENDPATH += $(OPIEDIR)/include
17 17
18include( $(OPIEDIR)/include.pro ) 18include( $(OPIEDIR)/include.pro )
19
20!isEmpty( LIBFLITE_INC_DIR ) {
21 INCLUDEPATH = $$LIBFLITE_INC_DIR $$INCLUDEPATH
22}
23!isEmpty( LIBFLITE_LIB_DIR ) {
24 LIBS = -L$$LIBFLITE_LIB_DIR $$LIBS
25}
26
27
28
diff --git a/noncore/apps/opie-reader/FliteDyn16/config.in b/noncore/apps/opie-reader/FliteDyn16/config.in
index 869fddc..c6f73e5 100644
--- a/noncore/apps/opie-reader/FliteDyn16/config.in
+++ b/noncore/apps/opie-reader/FliteDyn16/config.in
@@ -1,4 +1,6 @@
1 config OPIE-READER-FLITEDYN16 1 config OPIE-READER-FLITEDYN16
2 boolean "opie-reader flite plugin (speech output via lib in 16kHz)" 2 boolean "opie-reader flite plugin (speech output via lib in 16kHz)"
3 default "n" 3 default "n"
4 depends OPIE-READER 4 depends OPIE-READER && LIBFLITE_DEP
5 comment "opie-reader flite plugin needs libflite"
6 depends !( OPIE-READER && LIBFLITE_DEP )