commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r10037 - in openbts/branches/developers/jcorgan/auto:


From: jcorgan
Subject: [Commit-gnuradio] r10037 - in openbts/branches/developers/jcorgan/auto: . Control GSM RFHardware SIP SMS TRXManager Transceiver apps config doc
Date: Sat, 22 Nov 2008 15:23:24 -0700 (MST)

Author: jcorgan
Date: 2008-11-22 15:23:23 -0700 (Sat, 22 Nov 2008)
New Revision: 10037

Added:
   openbts/branches/developers/jcorgan/auto/Control/Makefile.am
   openbts/branches/developers/jcorgan/auto/GSM/Makefile.am
   openbts/branches/developers/jcorgan/auto/RFHardware/Makefile.am
   openbts/branches/developers/jcorgan/auto/SIP/Makefile.am
   openbts/branches/developers/jcorgan/auto/SMS/Makefile.am
   openbts/branches/developers/jcorgan/auto/TRXManager/Makefile.am
   openbts/branches/developers/jcorgan/auto/Transceiver/Makefile.am
   openbts/branches/developers/jcorgan/auto/apps/Makefile.am
   openbts/branches/developers/jcorgan/auto/config/pkg.m4
   openbts/branches/developers/jcorgan/auto/doc/Makefile.am
Removed:
   openbts/branches/developers/jcorgan/auto/Control/Makefile
   openbts/branches/developers/jcorgan/auto/GSM/LAPDExample/
   openbts/branches/developers/jcorgan/auto/GSM/Makefile
   openbts/branches/developers/jcorgan/auto/SIP/Makefile
   openbts/branches/developers/jcorgan/auto/SMS/Makefile
   openbts/branches/developers/jcorgan/auto/TRXManager/Makefile
   openbts/branches/developers/jcorgan/auto/Transceiver/Makefile
   openbts/branches/developers/jcorgan/auto/doc/Makefile
Modified:
   openbts/branches/developers/jcorgan/auto/Control/
   openbts/branches/developers/jcorgan/auto/Control/ControlCommon.cpp
   openbts/branches/developers/jcorgan/auto/Control/ControlCommon.h
   openbts/branches/developers/jcorgan/auto/GSM/
   openbts/branches/developers/jcorgan/auto/GSM/GSMCommon.h
   openbts/branches/developers/jcorgan/auto/GSM/GSML1FEC.cpp
   openbts/branches/developers/jcorgan/auto/Makefile.am
   openbts/branches/developers/jcorgan/auto/Makefile.common
   openbts/branches/developers/jcorgan/auto/RFHardware/
   openbts/branches/developers/jcorgan/auto/SIP/
   openbts/branches/developers/jcorgan/auto/SMS/
   openbts/branches/developers/jcorgan/auto/TRXManager/
   openbts/branches/developers/jcorgan/auto/Transceiver/
   openbts/branches/developers/jcorgan/auto/apps/
   openbts/branches/developers/jcorgan/auto/apps/Makefile
   openbts/branches/developers/jcorgan/auto/config/Makefile.am
   openbts/branches/developers/jcorgan/auto/configure.ac
   openbts/branches/developers/jcorgan/auto/doc/
Log:
Added remaining directories except test.  Builds cleanly on Ubuntu 8.10 with 
system supplied libosip2, libortp, and libusrp (none of which are installed in 
/usr/local).  Passes 'make distcheck'.


Property changes on: openbts/branches/developers/jcorgan/auto/Control
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.deps
.libs
PagerTest


Modified: openbts/branches/developers/jcorgan/auto/Control/ControlCommon.cpp
===================================================================
--- openbts/branches/developers/jcorgan/auto/Control/ControlCommon.cpp  
2008-11-22 20:03:38 UTC (rev 10036)
+++ openbts/branches/developers/jcorgan/auto/Control/ControlCommon.cpp  
2008-11-22 22:23:23 UTC (rev 10037)
@@ -23,10 +23,10 @@
 
 
 #include "ControlCommon.h"
-#include "GSMLogicalChannel.h"
-#include "GSML3Message.h"
-#include "GSML3CCMessages.h"
-#include "GSML3RRMessages.h"
+#include <GSMLogicalChannel.h>
+#include <GSML3Message.h>
+#include <GSML3CCMessages.h>
+#include <GSML3RRMessages.h>
 
 #ifndef LOCAL
 #include "SIPEngine.h"

Modified: openbts/branches/developers/jcorgan/auto/Control/ControlCommon.h
===================================================================
--- openbts/branches/developers/jcorgan/auto/Control/ControlCommon.h    
2008-11-22 20:03:38 UTC (rev 10036)
+++ openbts/branches/developers/jcorgan/auto/Control/ControlCommon.h    
2008-11-22 22:23:23 UTC (rev 10037)
@@ -44,10 +44,10 @@
 #define RTP_PORT_START 16484
 
 
-#include "GSML3CommonElements.h"
-#include "GSML3MMElements.h"
-#include "GSML3CCElements.h"
-#include "SIPEngine.h"
+#include <GSML3CommonElements.h>
+#include <GSML3MMElements.h>
+#include <GSML3CCElements.h>
+#include <SIPEngine.h>
 
 
 // Enough forward refs to prevent "kitchen sick" includes and circularity.

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

Added: openbts/branches/developers/jcorgan/auto/Control/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/Control/Makefile.am                
                (rev 0)
+++ openbts/branches/developers/jcorgan/auto/Control/Makefile.am        
2008-11-22 22:23:23 UTC (rev 10037)
@@ -0,0 +1,52 @@
+#
+# 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.Control
+
+noinst_LTLIBRARIES = libcontrol.la
+
+noinst_PROGRAMS = PagerTest
+
+libcontrol_la_SOURCES = \
+       CallControl.cpp \
+       ControlCommon.cpp \
+       FACCHDispatch.cpp \
+       MobilityManagement.cpp \
+       RadioResource.cpp \
+       SDCCHDispatch.cpp
+
+PagerTest_SOURCES = PagerTest.cpp
+PagerTest_LDADD = \
+       libcontrol.la \
+       $(COMMON_LA) \
+       $(GSM_LA) \
+       $(SIP_LA) \
+       $(TRX_LA) \
+       $(OSIP_LIBS) \
+       $(ORTP_LIBS)
+
+PagerTest_LDFLAGS = -lpthread
+
+noinst_HEADERS = \
+       ControlCommon.h


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


Modified: openbts/branches/developers/jcorgan/auto/GSM/GSMCommon.h
===================================================================
--- openbts/branches/developers/jcorgan/auto/GSM/GSMCommon.h    2008-11-22 
20:03:38 UTC (rev 10036)
+++ openbts/branches/developers/jcorgan/auto/GSM/GSMCommon.h    2008-11-22 
22:23:23 UTC (rev 10037)
@@ -30,9 +30,9 @@
 #include <ostream>
 #include <vector>
 
-#include "Threads.h"
-#include "Timeval.h"
-#include "BitVector.h"
+#include <Threads.h>
+#include <Timeval.h>
+#include <BitVector.h>
 
 
 

Modified: openbts/branches/developers/jcorgan/auto/GSM/GSML1FEC.cpp
===================================================================
--- openbts/branches/developers/jcorgan/auto/GSM/GSML1FEC.cpp   2008-11-22 
20:03:38 UTC (rev 10036)
+++ openbts/branches/developers/jcorgan/auto/GSM/GSML1FEC.cpp   2008-11-22 
22:23:23 UTC (rev 10037)
@@ -28,7 +28,7 @@
 #include "GSMSAPMux.h"
 #include "GSMConfig.h"
 #include "GSMTDMA.h"
-#include "TRXManager.h"
+#include <TRXManager.h>
 #include "Assert.h"
 
 using namespace std;

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

Added: openbts/branches/developers/jcorgan/auto/GSM/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/GSM/Makefile.am                    
        (rev 0)
+++ openbts/branches/developers/jcorgan/auto/GSM/Makefile.am    2008-11-22 
22:23:23 UTC (rev 10037)
@@ -0,0 +1,63 @@
+#
+# 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)
+
+noinst_LTLIBRARIES = libGSM.la
+
+libGSM_la_SOURCES = \
+       GSM610Tables.cpp \
+       GSMCommon.cpp \
+       GSMConfig.cpp \
+       GSML1FEC.cpp \
+       GSML2LAPDm.cpp \
+       GSML3CCElements.cpp \
+       GSML3CCMessages.cpp \
+       GSML3CommonElements.cpp \
+       GSML3Message.cpp \
+       GSML3MMElements.cpp \
+       GSML3MMMessages.cpp \
+       GSML3RRElements.cpp \
+       GSML3RRMessages.cpp \
+       GSMLogicalChannel.cpp \
+       GSMSAPMux.cpp \
+       GSMTDMA.cpp \
+       GSMTransfer.cpp
+
+noinst_HEADERS = \
+       GSM610Tables.h \
+       GSMCommon.h \
+       GSMConfig.h \
+       GSML1FEC.h \
+       GSML2LAPDm.h \
+       GSML3CCElements.h \
+       GSML3CCMessages.h \
+       GSML3CommonElements.h \
+       GSML3Message.h \
+       GSML3MMElements.h \
+       GSML3MMMessages.h \
+       GSML3RRElements.h \
+       GSML3RRMessages.h \
+       GSMLogicalChannel.h \
+       GSMSAPMux.h \
+       GSMTDMA.h \
+       GSMTransfer.h

Modified: openbts/branches/developers/jcorgan/auto/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/Makefile.am        2008-11-22 
20:03:38 UTC (rev 10036)
+++ openbts/branches/developers/jcorgan/auto/Makefile.am        2008-11-22 
22:23:23 UTC (rev 10037)
@@ -20,10 +20,20 @@
 
 include $(top_srcdir)/Makefile.common
 
+# Order must be preserved
 SUBDIRS = \
        config \
        AsteriskConfig \
-       CommonLibs
+       CommonLibs \
+       SIP \
+       GSM \
+       SMS \
+       Transceiver \
+       TRXManager \
+       Control \
+       RFHardware \
+       apps \
+       doc
 
 EXTRA_DIST = \
        INSTALLATION \

Modified: openbts/branches/developers/jcorgan/auto/Makefile.common
===================================================================
--- openbts/branches/developers/jcorgan/auto/Makefile.common    2008-11-22 
20:03:38 UTC (rev 10036)
+++ openbts/branches/developers/jcorgan/auto/Makefile.common    2008-11-22 
22:23:23 UTC (rev 10037)
@@ -18,6 +18,23 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-STD_DEFINES_AND_INCLUDES = -pthread
+COMMON_INCLUDEDIR = $(top_srcdir)/CommonLibs
+CONTROL_INCLUDEDIR = $(top_srcdir)/Control
+GSM_INCLUDEDIR = $(top_srcdir)/GSM
+SIP_INCLUDEDIR = $(top_srcdir)/SIP
+TRX_INCLUDEDIR = $(top_srcdir)/TRXManager
 
+STD_DEFINES_AND_INCLUDES = \
+       -I$(COMMON_INCLUDEDIR) \
+       -I$(CONTROL_INCLUDEDIR) \
+       -I$(GSM_INCLUDEDIR) \
+       -I$(SIP_INCLUDEDIR) \
+       -I$(TRX_INCLUDEDIR)
+
+COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
+GSM_LA = $(top_builddir)/GSM/libGSM.la
+SIP_LA = $(top_builddir)/SIP/libSIP.la
+TRX_LA = $(top_builddir)/TRXManager/libtrxmanager.la
+CONTROL_LA = $(top_builddir)/Control/libcontrol.la
+
 MOSTLYCLEANFILES = *~


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


Added: openbts/branches/developers/jcorgan/auto/RFHardware/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/RFHardware/Makefile.am             
                (rev 0)
+++ openbts/branches/developers/jcorgan/auto/RFHardware/Makefile.am     
2008-11-22 22:23:23 UTC (rev 10037)
@@ -0,0 +1,22 @@
+#
+# 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
+


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


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

Added: openbts/branches/developers/jcorgan/auto/SIP/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/SIP/Makefile.am                    
        (rev 0)
+++ openbts/branches/developers/jcorgan/auto/SIP/Makefile.am    2008-11-22 
22:23:23 UTC (rev 10037)
@@ -0,0 +1,39 @@
+#
+# 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) \
+            -I$(OSIP_INCLUDEDIR) $(OSIP_CPPFLAGS) \
+            -I$(ORTP_INCLUDEDIR) $(ORTP_CPPFLAGS)
+
+noinst_LTLIBRARIES = libSIP.la
+
+libSIP_la_SOURCES = \
+       SIPEngine.cpp \
+       SIPInterface.cpp \
+       SIPMessage.cpp \
+       SIPUtility.cpp
+
+noinst_HEADERS = \
+       SIPEngine.h \
+       SIPInterface.h \
+       SIPMessage.h \
+       SIPUtility.h


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


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

Added: openbts/branches/developers/jcorgan/auto/SMS/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/SMS/Makefile.am                    
        (rev 0)
+++ openbts/branches/developers/jcorgan/auto/SMS/Makefile.am    2008-11-22 
22:23:23 UTC (rev 10037)
@@ -0,0 +1,50 @@
+#
+# 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)
+
+# NOT COMPILED, ONLY HERE TO GET IN DISTRIBUTION TARBALL
+#noinst_LTLIBRARIES = libSMS.la
+
+#libSMS_la_SOURCES =
+EXTRA_DIST = \
+       README.SMS \
+       CMMessage.cpp \
+       CMProcessor.cpp \
+       RLMessage.cpp \
+       RLProcessor.cpp \
+       SMSMessages.cpp \
+       SMSProcessors.cpp \
+       SMSTransfer.cpp \
+       TLMessage.cpp \
+       TLProcessor.cpp
+
+noinst_HEADERS = \
+       CMMessage.h \
+       CMProcessor.h \
+       RLMessage.h \
+       RLProcessor.h \
+       SMSMessages.h \
+       SMSProcessors.h \
+       SMSTransfer.h \
+       TLMessage.h \
+       TLProcessor.h


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


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

Added: openbts/branches/developers/jcorgan/auto/TRXManager/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/TRXManager/Makefile.am             
                (rev 0)
+++ openbts/branches/developers/jcorgan/auto/TRXManager/Makefile.am     
2008-11-22 22:23:23 UTC (rev 10037)
@@ -0,0 +1,35 @@
+#
+# 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
+
+EXTRA_DIST = \
+       README.TRXManager \
+       clockdump.sh
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
+
+noinst_LTLIBRARIES = libtrxmanager.la
+
+libtrxmanager_la_SOURCES = \
+       TRXManager.cpp
+
+noinst_HEADERS = \
+       TRXManager.h


Property changes on: openbts/branches/developers/jcorgan/auto/Transceiver
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.deps
.libs
USRPping
transceiver


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

Added: openbts/branches/developers/jcorgan/auto/Transceiver/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/Transceiver/Makefile.am            
                (rev 0)
+++ openbts/branches/developers/jcorgan/auto/Transceiver/Makefile.am    
2008-11-22 22:23:23 UTC (rev 10037)
@@ -0,0 +1,77 @@
+#
+# 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) -I$(USRP_INCLUDEDIR)
+
+rev2dir = $(datadir)/usrp/rev2
+rev4dir = $(datadir)/usrp/rev4
+
+dist_rev2_DATA = std_inband.rbf
+dist_rev4_DATA = std_inband.rbf
+
+EXTRA_DIST = \
+       README \
+       README.Talgorithm
+
+noinst_LTLIBRARIES = libtransceiver.la
+
+libtransceiver_la_SOURCES = \
+       radioInterface.cpp \
+       sigProcLib.cpp \
+       Transceiver.cpp \
+       USRPDevice.cpp
+
+noinst_PROGRAMS = \
+       USRPping \
+       transceiver
+
+noinst_HEADERS = \
+       Complex.h \
+       radioInterface.h \
+       rcvLPF_651.h \
+       sendLPF_961.h \
+       sigProcLib.h \
+       Transceiver.h \
+       USRPDevice.h
+
+USRPping_SOURCES = USRPping.cpp
+USRPping_LDADD = \
+       libtransceiver.la \
+       $(COMMON_LA) \
+       $(USRP_LIBS)
+
+transceiver_SOURCES = runTransceiver.cpp
+transceiver_LDADD = \
+       libtransceiver.la \
+       $(GSM_LA) \
+       $(COMMON_LA) \
+       $(USRP_LIBS)
+
+
+MOSTLYCLEANFILES +=
+
+#radioInterface.cpp
+#ComplexTest.cpp
+#sigProcLibTest.cpp
+#sweepGenerator.cpp
+#testRadio.cpp
+


Property changes on: openbts/branches/developers/jcorgan/auto/apps
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in
.deps
.libs
OpenBTS850
OpenBTS900


Modified: openbts/branches/developers/jcorgan/auto/apps/Makefile
===================================================================
--- openbts/branches/developers/jcorgan/auto/apps/Makefile      2008-11-22 
20:03:38 UTC (rev 10036)
+++ openbts/branches/developers/jcorgan/auto/apps/Makefile      2008-11-22 
22:23:23 UTC (rev 10037)
@@ -1,31 +1,552 @@
-ROOT = ..
-include $(ROOT)/Makefile.include
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# apps/Makefile.  Generated from Makefile.in by configure.
 
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-APPS = OpenBTS900 OpenBTS850 transceiver
-.PHONY: apps
-apps:
-       $(MAKE) $(APPS)
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
-include $(ROOT)/Makefile.targets
 
+#
+# 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/>.
+#
 
-OPENBTSOBJS = $(COMMONOBJS) $(TRXMANAGER)/TRXManager.o  \
-               $(GSMOBJS) $(CONTROLOBJS) $(SIPOBJS)
-OpenBTS900: OpenBTS900.cpp $(COMMONINCS) $(OPENBTSOBJS)
-       $(BUILD) -o $@ $< $(OPENBTSOBJS) $(STDLIBS) $(SIPLIBS)
-OpenBTS850: OpenBTS850.cpp $(COMMONINCS) $(OPENBTSOBJS)
-       $(BUILD) -o $@ $< $(OPENBTSOBJS) $(STDLIBS) $(SIPLIBS)
+#
+# 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/>.
+#
 
-transceiver:
-       $(MAKE) -C $(ROOT)/Transceiver transceiver
-       $(RM) ./transceiver
-       - ln -s $(ROOT)/Transceiver/transceiver ./transceiver
 
+pkgdatadir = $(datadir)/openbts
+pkglibdir = $(libdir)/openbts
+pkgincludedir = $(includedir)/openbts
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(top_srcdir)/Makefile.common
+noinst_PROGRAMS = OpenBTS850$(EXEEXT) OpenBTS900$(EXEEXT)
+subdir = apps
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/pkg.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_OpenBTS850_OBJECTS = OpenBTS850.$(OBJEXT)
+OpenBTS850_OBJECTS = $(am_OpenBTS850_OBJECTS)
+am__DEPENDENCIES_1 =
+OpenBTS850_DEPENDENCIES = $(COMMON_LA) $(SIP_LA) $(GSM_LA) $(TRX_LA) \
+       $(CONTROL_LA) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_OpenBTS900_OBJECTS = OpenBTS900.$(OBJEXT)
+OpenBTS900_OBJECTS = $(am_OpenBTS900_OBJECTS)
+OpenBTS900_DEPENDENCIES = $(COMMON_LA) $(SIP_LA) $(GSM_LA) $(TRX_LA) \
+       $(CONTROL_LA) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
+SOURCES = $(OpenBTS850_SOURCES) $(OpenBTS900_SOURCES)
+DIST_SOURCES = $(OpenBTS850_SOURCES) $(OpenBTS900_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/jcorgan/gnuradio/openbts-auto/missing --run 
aclocal-1.10
+AMTAR = ${SHELL} /home/jcorgan/gnuradio/openbts-auto/missing --run tar
+AR = ar
+AS = as
+AUTOCONF = ${SHELL} /home/jcorgan/gnuradio/openbts-auto/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/jcorgan/gnuradio/openbts-auto/missing --run 
autoheader
+AUTOMAKE = ${SHELL} /home/jcorgan/gnuradio/openbts-auto/missing --run 
automake-1.10
+AWK = mawk
+CC = gcc
+CCAS = gcc
+CCASDEPMODE = depmode=gcc3
+CCASFLAGS = -g -O2
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2
+CPP = gcc -E
+CPPFLAGS = 
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DLLTOOL = dlltool
+DSYMUTIL = 
+DUMPBIN = 
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+FGREP = /bin/grep -F
+GREP = /bin/grep
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LD = /usr/bin/ld -m elf_x86_64
+LDFLAGS = 
+LIBOBJS = 
+LIBS = 
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LIPO = 
+LN_S = ln -s
+LTLIBOBJS = 
+MAKEINFO = ${SHELL} /home/jcorgan/gnuradio/openbts-auto/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NM = /usr/bin/nm -B
+NMEDIT = 
+OBJDUMP = objdump
+OBJEXT = o
+ORTP_CFLAGS = -D_REENTRANT -DORTP_INET6  
+ORTP_CPPFLAGS =  -D_REENTRANT -DORTP_INET6
+ORTP_INCLUDEDIR = /usr/include
+ORTP_LIBS = -lortp -lpthread  
+OSIP_CFLAGS = -DOSIP_MT -DHAVE_PTHREAD  
+OSIP_CPPFLAGS =  -DOSIP_MT -DHAVE_PTHREAD
+OSIP_INCLUDEDIR = /usr/include
+OSIP_LIBS = -losipparser2 -losip2  
+OTOOL = 
+OTOOL64 = 
+PACKAGE = openbts
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = openbts
+PACKAGE_STRING = openbts 1.1svn
+PACKAGE_TARNAME = openbts
+PACKAGE_VERSION = 1.1svn
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+RANLIB = ranlib
+RM_PROG = /bin/rm
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+STRIP = strip
+USRP_CFLAGS = -DOMNITHREAD_POSIX=1 -I/home/jcorgan/.sys/include  
+USRP_CPPFLAGS =  -DOMNITHREAD_POSIX=1 -I/home/jcorgan/.sys/include
+USRP_INCLUDEDIR = /home/jcorgan/.sys/include
+USRP_LIBS = -L/home/jcorgan/.sys/lib -lusrp -lusb  
+VERSION = 1.1svn
+abs_builddir = /home/jcorgan/gnuradio/openbts-auto/apps
+abs_srcdir = /home/jcorgan/gnuradio/openbts-auto/apps
+abs_top_builddir = /home/jcorgan/gnuradio/openbts-auto
+abs_top_srcdir = /home/jcorgan/gnuradio/openbts-auto
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_DUMPBIN = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = $(SHELL) /home/jcorgan/gnuradio/openbts-auto/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+lt_ECHO = echo
+mandir = ${datarootdir}/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /home/jcorgan/.sys
+program_transform_name = s,x,x,
+psdir = ${docdir}
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+sysconfdir = ${prefix}/etc
+target = x86_64-unknown-linux-gnu
+target_alias = 
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
+top_builddir = ..
+top_srcdir = ..
+COMMON_INCLUDEDIR = $(top_srcdir)/CommonLibs
+CONTROL_INCLUDEDIR = $(top_srcdir)/Control
+GSM_INCLUDEDIR = $(top_srcdir)/GSM
+SIP_INCLUDEDIR = $(top_srcdir)/SIP
+TRX_INCLUDEDIR = $(top_srcdir)/TRXManager
+STD_DEFINES_AND_INCLUDES = \
+       -I$(COMMON_INCLUDEDIR) \
+       -I$(CONTROL_INCLUDEDIR) \
+       -I$(GSM_INCLUDEDIR) \
+       -I$(SIP_INCLUDEDIR) \
+       -I$(TRX_INCLUDEDIR)
 
-.PHONY: clean
-clean:
-       - $(RM) *.o *.~ temp 
-       - $(RM) $(APPS)
+COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
+GSM_LA = $(top_builddir)/GSM/libGSM.la
+SIP_LA = $(top_builddir)/SIP/libSIP.la
+TRX_LA = $(top_builddir)/TRXManager/libtrxmanager.la
+CONTROL_LA = $(top_builddir)/Control/libcontrol.la
+MOSTLYCLEANFILES = *~
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
+OpenBTS850_SOURCES = OpenBTS850.cpp
+OpenBTS850_LDADD = \
+       $(COMMON_LA) \
+       $(SIP_LA) \
+       $(GSM_LA) \
+       $(TRX_LA) \
+       $(CONTROL_LA) \
+       $(OSIP_LIBS) \
+       $(ORTP_LIBS)
 
+OpenBTS900_SOURCES = OpenBTS900.cpp
+OpenBTS900_LDADD = \
+       $(COMMON_LA) \
+       $(SIP_LA) \
+       $(GSM_LA) \
+       $(TRX_LA) \
+       $(CONTROL_LA) \
+       $(OSIP_LIBS) \
+       $(ORTP_LIBS)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common 
$(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  apps/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --foreign  apps/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 
$(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 
$(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure 
$(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstPROGRAMS:
+       @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         echo " rm -f $$p $$f"; \
+         rm -f $$p $$f ; \
+       done
+OpenBTS850$(EXEEXT): $(OpenBTS850_OBJECTS) $(OpenBTS850_DEPENDENCIES) 
+       @rm -f OpenBTS850$(EXEEXT)
+       $(CXXLINK) $(OpenBTS850_OBJECTS) $(OpenBTS850_LDADD) $(LIBS)
+OpenBTS900$(EXEEXT): $(OpenBTS900_OBJECTS) $(OpenBTS900_DEPENDENCIES) 
+       @rm -f OpenBTS900$(EXEEXT)
+       $(CXXLINK) $(OpenBTS900_OBJECTS) $(OpenBTS900_LDADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+
+distclean-compile:
+       -rm -f *.tab.c
+
+include ./$(DEPDIR)/OpenBTS850.Po
+include ./$(DEPDIR)/OpenBTS900.Po
+
+.cpp.o:
+       $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+       mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#      source='$<' object='$@' libtool=no \
+#      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+#      $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+       $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ 
`$(CYGPATH_W) '$<'`
+       mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#      source='$<' object='$@' libtool=no \
+#      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+#      $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+       $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+       mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#      source='$<' object='$@' libtool=yes \
+#      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+#      $(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         if test -d $$d/$$file; then \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+       mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+       clean-libtool clean-noinstPROGRAMS ctags distclean \
+       distclean-compile distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+       pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: openbts/branches/developers/jcorgan/auto/apps/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/apps/Makefile.am                   
        (rev 0)
+++ openbts/branches/developers/jcorgan/auto/apps/Makefile.am   2008-11-22 
22:23:23 UTC (rev 10037)
@@ -0,0 +1,47 @@
+#
+# 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)
+
+noinst_PROGRAMS = \
+       OpenBTS850 \
+       OpenBTS900
+
+OpenBTS850_SOURCES = OpenBTS850.cpp
+OpenBTS850_LDADD = \
+       $(COMMON_LA) \
+       $(SIP_LA) \
+       $(GSM_LA) \
+       $(TRX_LA) \
+       $(CONTROL_LA) \
+       $(OSIP_LIBS) \
+       $(ORTP_LIBS)
+
+OpenBTS900_SOURCES = OpenBTS900.cpp
+OpenBTS900_LDADD = \
+       $(COMMON_LA) \
+       $(SIP_LA) \
+       $(GSM_LA) \
+       $(TRX_LA) \
+       $(CONTROL_LA) \
+       $(OSIP_LIBS) \
+       $(ORTP_LIBS)

Modified: openbts/branches/developers/jcorgan/auto/config/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/config/Makefile.am 2008-11-22 
20:03:38 UTC (rev 10036)
+++ openbts/branches/developers/jcorgan/auto/config/Makefile.am 2008-11-22 
22:23:23 UTC (rev 10037)
@@ -24,6 +24,7 @@
 m4datadir = $(datadir)/aclocal
 
 # List your m4 macros here
-m4macros =
+m4macros = \
+       pkg.m4
 
 EXTRA_DIST = $(m4macros) 

Added: openbts/branches/developers/jcorgan/auto/config/pkg.m4
===================================================================
--- openbts/branches/developers/jcorgan/auto/config/pkg.m4                      
        (rev 0)
+++ openbts/branches/developers/jcorgan/auto/config/pkg.m4      2008-11-22 
22:23:23 UTC (rev 10037)
@@ -0,0 +1,188 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <address@hidden>.
+# Copyright © 2008 Free Software Foundation, Inc.
+#
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+       AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=m4_default([$1], [0.18])
+       AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               AC_MSG_RESULT([yes])
+       else
+               AC_MSG_RESULT([no])
+               PKG_CONFIG=""
+       fi
+               
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+                        [pkg_failed=yes])
+    fi
+else
+       pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+# E.g.,
+#   PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, 
action-not)
+#   defines:
+#
+#     GSTUFF_LIBS
+#     GSTUFF_CFLAGS
+#     GSTUFF_INCLUDEDIR
+#     GSTUFF_CPPFLAGS    # the -I, -D and -U's out of CFLAGS
+#
+# see pkg-config man page also defines GSTUFF_PKG_ERRORS on error
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_INCLUDEDIR], [includedir for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+
+if test x$cross_compiling = xyes
+then
+  _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2])
+else
+  _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
+fi
+
+_PKG_CONFIG([$1][_INCLUDEDIR], [variable=includedir], [$2])
+
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables 
$1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+               $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout 
--print-errors "$2"`
+        else 
+               $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors 
"$2"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+       ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+               [AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+       ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+               [$4])
+else
+       $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+       $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+       $1[]_INCLUDEDIR=$pkg_cv_[]$1[]_INCLUDEDIR
+
+       $1[]_CPPFLAGS=""
+       for flag in $$1[]_CFLAGS; do
+         case $flag in
+          -I* | -D* | -U*) $1[]_CPPFLAGS="$$1[]_CPPFLAGS $flag" ;;
+          esac
+        done
+       pkg_cv_[]$1[]_CPPFLAGS=$$1[]_CPPFLAGS
+       AC_SUBST($1[]_CPPFLAGS)
+
+        AC_MSG_RESULT([yes])
+       ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES

Modified: openbts/branches/developers/jcorgan/auto/configure.ac
===================================================================
--- openbts/branches/developers/jcorgan/auto/configure.ac       2008-11-22 
20:03:38 UTC (rev 10036)
+++ openbts/branches/developers/jcorgan/auto/configure.ac       2008-11-22 
22:23:23 UTC (rev 10037)
@@ -52,12 +52,30 @@
 AC_HEADER_TIME
 AC_C_BIGENDIAN
 
+# Defines USRP_CFLAGS, USRP_INCLUDEDIR, and USRP_LIBS
+PKG_CHECK_MODULES(USRP, usrp > 3.1)
+
+# Defines OSIP_CFLAGS, OSIP_INCLUDEDIR, and OSIP_LIBS
+PKG_CHECK_MODULES(OSIP, libosip2)
+
+# Defines ORTP_CFLAGS, ORTP_INCLUDEDIR, and ORTP_LIBS
+PKG_CHECK_MODULES(ORTP, ortp)
+
 dnl Output files
 AC_CONFIG_FILES([\
     Makefile \
+    apps/Makefile \
     config/Makefile \
+    doc/Makefile \
     AsteriskConfig/Makefile \
     CommonLibs/Makefile \
+    Control/Makefile \
+    GSM/Makefile \
+    RFHardware/Makefile \
+    SIP/Makefile \
+    SMS/Makefile \
+    Transceiver/Makefile \
+    TRXManager/Makefile \
 ])
 
 AC_OUTPUT


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


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

Added: openbts/branches/developers/jcorgan/auto/doc/Makefile.am
===================================================================
--- openbts/branches/developers/jcorgan/auto/doc/Makefile.am                    
        (rev 0)
+++ openbts/branches/developers/jcorgan/auto/doc/Makefile.am    2008-11-22 
22:23:23 UTC (rev 10037)
@@ -0,0 +1,26 @@
+#
+# 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
+
+EXTRA_DIST = \
+       OpenBTSProject.pdf \
+       OpenBTSProject.tex
+





reply via email to

[Prev in Thread] Current Thread [Next in Thread]