diff options
Diffstat (limited to 'orkbasecxx')
| -rw-r--r-- | orkbasecxx/Makefile.am | 10 | ||||
| -rw-r--r-- | orkbasecxx/TapeProcessor.h | 4 | ||||
| -rw-r--r-- | orkbasecxx/configure.in | 4 | ||||
| -rw-r--r-- | orkbasecxx/messages/Makefile.am | 5 |
4 files changed, 15 insertions, 8 deletions
diff --git a/orkbasecxx/Makefile.am b/orkbasecxx/Makefile.am index 0e8bed6..586b48b 100644 --- a/orkbasecxx/Makefile.am +++ b/orkbasecxx/Makefile.am @@ -7,9 +7,13 @@ lib_LTLIBRARIES = liborkbase.la liborkbase_la_LDFLAGS = liborkbase_la_SOURCES = Filter.cpp g711.c \ OrkBase.cpp Object.cpp ObjectFactory.cpp \ - OrkClient.cpp AudioCapture.cpp Utils.cpp + OrkClient.cpp AudioCapture.cpp Utils.cpp \ + AudioTape.cpp \ + Config.cpp ConfigManager.cpp LogManager.cpp \ + MultiThreadedServer.cpp TapeProcessor.cpp #INCLUDES = -I/projects/ext/xmlrpc++/xmlrpc++0.7/src -SUBDIRS = messages serializers +SUBDIRS = messages serializers audiofile liborkbase_la_LIBADD = $(top_builddir)/serializers/libserializers.la \ - $(top_builddir)/messages/libmessages.la + $(top_builddir)/messages/libmessages.la \ + $(top_builddir)/audiofile/libaudiofile.la AM_CXXFLAGS = -D_REENTRANT diff --git a/orkbasecxx/TapeProcessor.h b/orkbasecxx/TapeProcessor.h index a177480..54f5eca 100644 --- a/orkbasecxx/TapeProcessor.h +++ b/orkbasecxx/TapeProcessor.h @@ -65,4 +65,6 @@ private: TapeProcessorRef m_firstTapeProcessor;
};
-#endif
\ No newline at end of file +#endif
+
+
diff --git a/orkbasecxx/configure.in b/orkbasecxx/configure.in index 6cc6be3..1c87c5b 100644 --- a/orkbasecxx/configure.in +++ b/orkbasecxx/configure.in @@ -1,7 +1,7 @@ AC_INIT(configure.in) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(orkbase, 0.5) +AM_INIT_AUTOMAKE(orkbase, 0.6) AC_PREFIX_DEFAULT(/usr) @@ -9,4 +9,4 @@ AC_LANG_CPLUSPLUS AC_PROG_CXX AM_PROG_LIBTOOL -AC_OUTPUT(Makefile messages/Makefile serializers/Makefile) +AC_OUTPUT(Makefile messages/Makefile serializers/Makefile audiofile/Makefile) diff --git a/orkbasecxx/messages/Makefile.am b/orkbasecxx/messages/Makefile.am index 0465da7..aba1c8e 100644 --- a/orkbasecxx/messages/Makefile.am +++ b/orkbasecxx/messages/Makefile.am @@ -1,7 +1,8 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libmessages.la -libmessages_la_SOURCES = AsyncMessage.cpp AsyncMessage.h Message.cpp Message.h\ - SyncMessage.cpp SyncMessage.h +libmessages_la_SOURCES = AsyncMessage.cpp Message.cpp \ + SyncMessage.cpp CaptureMsg.cpp DeleteTapeMsg.cpp \ + PingMsg.cpp TapeMsg.cpp #libmessages_la_LIBADD = -L/projects/ext/xmlrpc++/xmlrpc++0.7/ -lXmlRpc INCLUDES = -I@top_srcdir@ |