[Commit-gnuradio] r8515 - in usrp2/trunk/host-ng: . apps include include/usrp2 lib

[jcorgan]

Author: jcorgan
Date: 2008-05-28 09:57:25 -0600 (Wed, 28 May 2008)
New Revision: 8515

Added:
   usrp2/trunk/host-ng/include/
   usrp2/trunk/host-ng/include/Makefile.am
   usrp2/trunk/host-ng/include/usrp2/
Removed:
   usrp2/trunk/host-ng/usrp2/
Modified:
   usrp2/trunk/host-ng/Makefile.am
   usrp2/trunk/host-ng/Makefile.common
   usrp2/trunk/host-ng/apps/test_usrp2.cc
   usrp2/trunk/host-ng/configure.ac
   usrp2/trunk/host-ng/include/usrp2/Makefile.am
   usrp2/trunk/host-ng/lib/basic.cc
Log:
Move includes into subdirectory.  Use <> for config.h.

Modified: usrp2/trunk/host-ng/Makefile.am
===================================================================
--- usrp2/trunk/host-ng/Makefile.am     2008-05-28 15:40:06 UTC (rev 8514)
+++ usrp2/trunk/host-ng/Makefile.am     2008-05-28 15:57:25 UTC (rev 8515)
@@ -26,4 +26,4 @@
        configure \
        config.h.in
 
-SUBDIRS = config usrp2 lib apps
+SUBDIRS = config include lib apps

Modified: usrp2/trunk/host-ng/Makefile.common
===================================================================
--- usrp2/trunk/host-ng/Makefile.common 2008-05-28 15:40:06 UTC (rev 8514)
+++ usrp2/trunk/host-ng/Makefile.common 2008-05-28 15:57:25 UTC (rev 8515)
@@ -19,7 +19,7 @@
 AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
 
 STD_DEFINES_AND_INCLUDES = \
-  -I$(top_srcdir) \
+  -I$(top_srcdir)/include \
   -I$(top_srcdir)/../firmware/include \
   $(GNURADIO_CORE_CFLAGS)
 

Modified: usrp2/trunk/host-ng/apps/test_usrp2.cc
===================================================================
--- usrp2/trunk/host-ng/apps/test_usrp2.cc      2008-05-28 15:40:06 UTC (rev 
8514)
+++ usrp2/trunk/host-ng/apps/test_usrp2.cc      2008-05-28 15:57:25 UTC (rev 
8515)
@@ -17,7 +17,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2/basic.h>

Modified: usrp2/trunk/host-ng/configure.ac
===================================================================
--- usrp2/trunk/host-ng/configure.ac    2008-05-28 15:40:06 UTC (rev 8514)
+++ usrp2/trunk/host-ng/configure.ac    2008-05-28 15:57:25 UTC (rev 8515)
@@ -205,8 +205,9 @@
     Makefile \
     apps/Makefile \
     config/Makefile \
+    include/Makefile \
+    include/usrp2/Makefile \
     lib/Makefile \
-    usrp2/Makefile \
 ])
 
 dnl run_tests.sh is created from run_tests.in.sh.  Make it executable.


Property changes on: usrp2/trunk/host-ng/include
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: usrp2/trunk/host-ng/include/Makefile.am
===================================================================
--- usrp2/trunk/host-ng/include/Makefile.am                             (rev 0)
+++ usrp2/trunk/host-ng/include/Makefile.am     2008-05-28 15:57:25 UTC (rev 
8515)
@@ -0,0 +1,23 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio 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, or (at your option)
+# any later version.
+# 
+# GNU Radio 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.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = usrp2

Copied: usrp2/trunk/host-ng/include/usrp2 (from rev 8514, 
usrp2/trunk/host-ng/usrp2)

Modified: usrp2/trunk/host-ng/include/usrp2/Makefile.am
===================================================================
--- usrp2/trunk/host-ng/usrp2/Makefile.am       2008-05-28 15:40:06 UTC (rev 
8514)
+++ usrp2/trunk/host-ng/include/usrp2/Makefile.am       2008-05-28 15:57:25 UTC 
(rev 8515)
@@ -23,5 +23,3 @@
 
 usrp2include_HEADERS = \
        basic.h
-
-EXTRA_DIST = $(usrp2include_INCLUDES)

Modified: usrp2/trunk/host-ng/lib/basic.cc
===================================================================
--- usrp2/trunk/host-ng/lib/basic.cc    2008-05-28 15:40:06 UTC (rev 8514)
+++ usrp2/trunk/host-ng/lib/basic.cc    2008-05-28 15:57:25 UTC (rev 8515)
@@ -17,7 +17,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2/basic.h>