[Homeros] [PATCH 2/2] Complete removal of buildConfig.h

Dmitri Paduchikh dpaduch на k66.ru
Вт Мар 2 12:05:53 UTC 2010


---
 daemon/core/ExecutorInterface.cpp |    2 ++
 daemon/voiceman.h                 |    1 -
 emacspeak/makefile.am             |    2 +-
 emacspeak/vmemacspeak_base.h      |    1 -
 libvmclient/vm.c                  |    1 -
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/daemon/core/ExecutorInterface.cpp b/daemon/core/ExecutorInterface.cpp
index 016a067..bb69aae 100644
--- a/daemon/core/ExecutorInterface.cpp
+++ b/daemon/core/ExecutorInterface.cpp
@@ -3,6 +3,8 @@
 #include"PlaybackQueue.h"
 #include"executorCommandHeader.h"
 
+#define NULL_DEVICE "/dev/null" /*FIXME:Global configuration*/
+
 //FIXME:executor termination;
 //FIXME:Proper command names in logging messages;
 //FIXME:unexpected executor death;
diff --git a/daemon/voiceman.h b/daemon/voiceman.h
index ddac00d..281e71e 100644
--- a/daemon/voiceman.h
+++ b/daemon/voiceman.h
@@ -4,7 +4,6 @@
 
 //Basically required stuff;
 #include"system/system.h"
-#include"../build/buildConfig.h"
 #include"vmstrings.h"
 #include"Transcoding.h"
 #include"system/logging.h"
diff --git a/emacspeak/makefile.am b/emacspeak/makefile.am
index 43d115e..a2e0b48 100644
--- a/emacspeak/makefile.am
+++ b/emacspeak/makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DNDEBUG -I../build -I$(top_srcdir)/libvmclient
+AM_CPPFLAGS = -DNDEBUG -I$(top_srcdir)/libvmclient
 LDADD = $(top_srcdir)/libvmclient/libvmclient.a
 
 bin_PROGRAMS = voiceman voiceman-espeak
diff --git a/emacspeak/vmemacspeak_base.h b/emacspeak/vmemacspeak_base.h
index 3398d28..68cfecb 100644
--- a/emacspeak/vmemacspeak_base.h
+++ b/emacspeak/vmemacspeak_base.h
@@ -15,6 +15,5 @@
 #include"vmclient.h"
 #include"transcoding.h"
 #include"strings.h"
-#include"buildConfig.h"
 
 #endif //__VOICEMAN_EMACSPEAK_BASE_H__;
diff --git a/libvmclient/vm.c b/libvmclient/vm.c
index 1369e6c..aeca29c 100644
--- a/libvmclient/vm.c
+++ b/libvmclient/vm.c
@@ -27,7 +27,6 @@
 #include<resolv.h>
 #include"vmclient.h"
 
-#include"../build/buildConfig.h"
 
 #define INET_PREFIX "TCP/IP:"
 
-- 
1.7.0



Подробная информация о списке рассылки Homeros