[Commit-gnuradio] r9442 - in usrp2/trunk/host: . config

[jcorgan]

Author: jcorgan
Date: 2008-08-29 10:35:03 -0600 (Fri, 29 Aug 2008)
New Revision: 9442

Added:
   usrp2/trunk/host/usrp2.pc
   usrp2/trunk/host/usrp2.pc.in
Removed:
   usrp2/trunk/host/config/gr_x86_64.m4
Modified:
   usrp2/trunk/host/Makefile.am
   usrp2/trunk/host/Makefile.common
   usrp2/trunk/host/config/Makefile.am
   usrp2/trunk/host/configure.ac
Log:
Add usrp2.pc

Modified: usrp2/trunk/host/Makefile.am
===================================================================
--- usrp2/trunk/host/Makefile.am        2008-08-29 00:25:01 UTC (rev 9441)
+++ usrp2/trunk/host/Makefile.am        2008-08-29 16:35:03 UTC (rev 9442)
@@ -22,8 +22,12 @@
 
 include $(top_srcdir)/Makefile.common
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = usrp2.pc
+
 EXTRA_DIST = \
        configure \
-       config.h.in
+       config.h.in \
+       usrp2.pc.in        
 
 SUBDIRS = config include lib apps

Modified: usrp2/trunk/host/Makefile.common
===================================================================
--- usrp2/trunk/host/Makefile.common    2008-08-29 00:25:01 UTC (rev 9441)
+++ usrp2/trunk/host/Makefile.common    2008-08-29 16:35:03 UTC (rev 9442)
@@ -31,5 +31,3 @@
 # not. We define it now in configure.ac using AM_PATH_PROG, but now
 # here have to add a -f to be like GNU make.
 RM=$(RM_PROG) -f
-
-MOSTLYCLEANFILES = *~ *.pyc *.pyo *.loT

Modified: usrp2/trunk/host/config/Makefile.am
===================================================================
--- usrp2/trunk/host/config/Makefile.am 2008-08-29 00:25:01 UTC (rev 9441)
+++ usrp2/trunk/host/config/Makefile.am 2008-08-29 16:35:03 UTC (rev 9442)
@@ -17,3 +17,34 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+
+M4FILES = \
+       ax_boost_base.m4 \
+       ax_boost_date_time.m4 \
+       ax_boost_filesystem.m4 \
+       ax_boost_iostreams.m4 \
+       ax_boost_program_options.m4 \
+       ax_boost_python.m4 \
+       ax_boost_regex.m4 \
+       ax_boost_serialization.m4 \
+       ax_boost_signals.m4 \
+       ax_boost_system.m4 \
+       ax_boost_test_exec_monitor.m4 \
+       ax_boost_thread.m4 \
+       ax_boost_unit_test_framework.m4 \
+       ax_boost_wserialization.m4 \
+       gr_doxygen.m4 \
+       gr_gprof.m4 \
+       gr_lib64.m4 \
+       gr_no_undefined.m4 \
+       gr_python.m4 \
+       gr_scripting.m4 \
+       gr_set_md_cpu.m4 \
+       gr_subversion.m4 \
+       gr_swig.m4 \
+       lf_cc.m4 \
+       lf_cxx.m4 \
+       lf_warnings.m4 \
+       pkg.m4
+
+EXTRA_DIST = $(M4FILES)

Deleted: usrp2/trunk/host/config/gr_x86_64.m4

Modified: usrp2/trunk/host/configure.ac
===================================================================
--- usrp2/trunk/host/configure.ac       2008-08-29 00:25:01 UTC (rev 9441)
+++ usrp2/trunk/host/configure.ac       2008-08-29 16:35:03 UTC (rev 9442)
@@ -40,9 +40,9 @@
   user_set_cxxflags=yes
 fi
 
-GR_X86_64              dnl check for lib64 suffix
 LF_CONFIGURE_CC
 LF_CONFIGURE_CXX
+GR_LIB64
 
 dnl The three macros above are known to override CXXFLAGS if the user
 dnl didn't specify them.  Though I'm sure somebody thought this was
@@ -217,6 +217,7 @@
  
 AC_CONFIG_FILES([\
     Makefile \
+    usrp2.pc \
     apps/Makefile \
     config/Makefile \
     include/Makefile \

Added: usrp2/trunk/host/usrp2.pc
===================================================================
--- usrp2/trunk/host/usrp2.pc                           (rev 0)
+++ usrp2/trunk/host/usrp2.pc   2008-08-29 16:35:03 UTC (rev 9442)
@@ -0,0 +1,11 @@
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: usrp2
+Description: Universal Software Radio Peripheral 2
+Requires: gnuradio-omnithread gruel
+Version: 0.0svn
+Libs: -L${libdir} -lusrp2
+Cflags: -I${includedir} 

Added: usrp2/trunk/host/usrp2.pc.in
===================================================================
--- usrp2/trunk/host/usrp2.pc.in                                (rev 0)
+++ usrp2/trunk/host/usrp2.pc.in        2008-08-29 16:35:03 UTC (rev 9442)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: usrp2
+Description: Universal Software Radio Peripheral 2
+Requires: gnuradio-omnithread gruel
+Version: @VERSION@
+Libs: -L${libdir} -lusrp2
+Cflags: -I${includedir} @DEFINES@