[Commit-gnuradio] r10035 - in openbts/branches/developers/jcorgan/auto: . AsteriskConfig CommonLibs

[jcorgan]

Author: jcorgan
Date: 2008-11-22 12:01:29 -0700 (Sat, 22 Nov 2008)
New Revision: 10035

Added:
   openbts/branches/developers/jcorgan/auto/AsteriskConfig/Makefile.am
   openbts/branches/developers/jcorgan/auto/CommonLibs/Makefile.am
Removed:
   openbts/branches/developers/jcorgan/auto/CommonLibs/Makefile
Modified:
   openbts/branches/developers/jcorgan/auto/
   openbts/branches/developers/jcorgan/auto/AsteriskConfig/
   openbts/branches/developers/jcorgan/auto/CommonLibs/
   openbts/branches/developers/jcorgan/auto/CommonLibs/BitVectorTest.cpp
   openbts/branches/developers/jcorgan/auto/Makefile.am
   openbts/branches/developers/jcorgan/auto/Makefile.common
   openbts/branches/developers/jcorgan/auto/README
   openbts/branches/developers/jcorgan/auto/configure.ac
Log:
Adds AsteriskConfig and CommonLibs to build


Property changes on: openbts/branches/developers/jcorgan/auto
___________________________________________________________________
Name: svn:ignore
   - configure
Makefile.in
config.guess
ltmain.sh
config.sub
config.h.in
autom4te.cache
missing
aclocal.m4
install-sh
config.log
config.h
config.status
stamp-h1
libtool
openbts*.tar.gz

   + configure
Makefile
Makefile.in
config.guess
ltmain.sh
config.sub
config.h.in
autom4te.cache
missing
aclocal.m4
install-sh
config.log
config.h
config.status
stamp-h1
libtool
depcomp
openbts*.tar.gz



Property changes on: openbts/branches/developers/jcorgan/auto/AsteriskConfig
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: openbts/branches/developers/jcorgan/auto/AsteriskConfig/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/AsteriskConfig/Makefile.am         
                (rev 0)
+++ openbts/branches/developers/jcorgan/auto/AsteriskConfig/Makefile.am 
2008-11-22 19:01:29 UTC (rev 10035)
@@ -0,0 +1,33 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This software is distributed under the terms of the GNU Public License.
+# See the COPYING file in the main directory for details.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+include $(top_srcdir)/Makefile.common
+
+# Install files in this directory
+ourdatadir = $(datadir)/OpenBTS/Asterisk
+
+dist_ourdata_DATA = \
+       cdr.conf \
+       extensions.conf \
+       indications.conf \
+       logger.conf \
+       modules.conf \
+       README.AsteriskConf \
+       sip.conf


Property changes on: openbts/branches/developers/jcorgan/auto/CommonLibs
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.deps
testDestination
testSource
BitVectorTest
SocketsTest
TimevalTest
VectorTest
InterthreadTest


Modified: openbts/branches/developers/jcorgan/auto/CommonLibs/BitVectorTest.cpp
===================================================================
--- openbts/branches/developers/jcorgan/auto/CommonLibs/BitVectorTest.cpp       
2008-11-22 17:11:46 UTC (rev 10034)
+++ openbts/branches/developers/jcorgan/auto/CommonLibs/BitVectorTest.cpp       
2008-11-22 19:01:29 UTC (rev 10035)
@@ -24,6 +24,7 @@
 
 #include "BitVector.h"
 #include <iostream>
+#include <cstdlib>
  
 using namespace std;
 

Deleted: openbts/branches/developers/jcorgan/auto/CommonLibs/Makefile

Added: openbts/branches/developers/jcorgan/auto/CommonLibs/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/CommonLibs/Makefile.am             
                (rev 0)
+++ openbts/branches/developers/jcorgan/auto/CommonLibs/Makefile.am     
2008-11-22 19:01:29 UTC (rev 10035)
@@ -0,0 +1,70 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This software is distributed under the terms of the GNU Public License.
+# See the COPYING file in the main directory for details.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
+
+EXTRA_DIST = README.common
+
+noinst_LTLIBRARIES = libcommon.la
+
+libcommon_la_SOURCES = \
+       BitVector.cpp \
+       LinkedLists.cpp \
+       Sockets.cpp \
+       Threads.cpp \
+       Timeval.cpp
+
+noinst_PROGRAMS = \
+       BitVectorTest \
+       InterthreadTest \
+       SocketsTest \
+       TimevalTest \
+       VectorTest
+
+noinst_HEADERS = \
+       Assert.h \
+       BitVector.h \
+       Interthread.h \
+       LinkedLists.h \
+       Sockets.h \
+       Threads.h \
+       Timeval.h \
+       Vector.h
+
+BitVectorTest_SOURCES = BitVectorTest.cpp
+BitVectorTest_LDADD = libcommon.la
+
+InterthreadTest_SOURCES = InterthreadTest.cpp
+InterthreadTest_LDADD = libcommon.la
+InterthreadTest_LDFLAGS = -lpthread
+
+SocketsTest_SOURCES = SocketsTest.cpp
+SocketsTest_LDADD = libcommon.la
+SocketsTest_LDFLAGS = -lpthread
+
+TimevalTest_SOURCES = TimevalTest.cpp
+TimevalTest_LDADD = libcommon.la
+
+VectorTest_SOURCES = VectorTest.cpp
+VectorTest_LDADD = libcommon.la
+
+MOSTLYCLEANFILES += testSource testDestination

Modified: openbts/branches/developers/jcorgan/auto/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/Makefile.am        2008-11-22 
17:11:46 UTC (rev 10034)
+++ openbts/branches/developers/jcorgan/auto/Makefile.am        2008-11-22 
19:01:29 UTC (rev 10035)
@@ -18,5 +18,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-SUBDIRS=config
+include $(top_srcdir)/Makefile.common
 
+SUBDIRS = \
+       config \
+       AsteriskConfig \
+       CommonLibs
+
+EXTRA_DIST = \
+       INSTALLATION \
+       README

Modified: openbts/branches/developers/jcorgan/auto/Makefile.common
===================================================================
--- openbts/branches/developers/jcorgan/auto/Makefile.common    2008-11-22 
17:11:46 UTC (rev 10034)
+++ openbts/branches/developers/jcorgan/auto/Makefile.common    2008-11-22 
19:01:29 UTC (rev 10035)
@@ -0,0 +1,23 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This software is distributed under the terms of the GNU Public License.
+# See the COPYING file in the main directory for details.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+STD_DEFINES_AND_INCLUDES = -pthread
+
+MOSTLYCLEANFILES = *~

Modified: openbts/branches/developers/jcorgan/auto/README
===================================================================
--- openbts/branches/developers/jcorgan/auto/README     2008-11-22 17:11:46 UTC 
(rev 10034)
+++ openbts/branches/developers/jcorgan/auto/README     2008-11-22 19:01:29 UTC 
(rev 10035)
@@ -12,7 +12,7 @@
 SMS            The SMS stack (incomplete).
 TRXManager     The interface between the GSM stack and the radio.
 Transceiver    The software transceiver and specific installation tests.
-apss           OpenBTS application binaries.
+apps           OpenBTS application binaries.
 doc            Project documentation.
 tests          Test fixtures for subsets of OpenBTS components.
 

Modified: openbts/branches/developers/jcorgan/auto/configure.ac
===================================================================
--- openbts/branches/developers/jcorgan/auto/configure.ac       2008-11-22 
17:11:46 UTC (rev 10034)
+++ openbts/branches/developers/jcorgan/auto/configure.ac       2008-11-22 
19:01:29 UTC (rev 10035)
@@ -31,6 +31,7 @@
 AM_INIT_AUTOMAKE
 
 AM_PROG_AS
+AC_PROG_CXX
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
@@ -55,6 +56,8 @@
 AC_CONFIG_FILES([\
     Makefile \
     config/Makefile \
+    AsteriskConfig/Makefile \
+    CommonLibs/Makefile \
 ])
 
 AC_OUTPUT