aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2012-04-14 21:14:07 +0200
committerSylvain Munaut <tnt@246tNt.com>2012-04-18 22:19:14 +0200
commitab13571d7ce4a9795972ada914edbfacb8d74687 (patch)
tree9b179698eac3c325a58526580e56dbca1e6f3c13
parentdd339d41e1b1e1320aaf7c87bfde5914d0405572 (diff)
Rename to libosmosdr to libosmodsp to avoid conflict with the SDR hw
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--Doxyfile.in6
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac6
-rw-r--r--include/osmocom/Makefile.am2
-rw-r--r--include/osmocom/dsp/Makefile.am3
-rw-r--r--include/osmocom/dsp/cfile.h (renamed from include/osmocom/sdr/cfile.h)6
-rw-r--r--include/osmocom/dsp/cxvec.h (renamed from include/osmocom/sdr/cxvec.h)6
-rw-r--r--include/osmocom/dsp/cxvec_math.h (renamed from include/osmocom/sdr/cxvec_math.h)8
-rw-r--r--include/osmocom/sdr/Makefile.am3
-rw-r--r--libosmodsp.pc.in (renamed from libosmosdr.pc.in)4
-rw-r--r--src/Makefile.am6
-rw-r--r--src/cfile.c2
-rw-r--r--src/cxvec.c2
-rw-r--r--src/cxvec_math.c4
14 files changed, 30 insertions, 30 deletions
diff --git a/Doxyfile.in b/Doxyfile.in
index 6e7f682..b6d544c 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = libosmosdr
+PROJECT_NAME = libosmodsp
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
@@ -37,7 +37,7 @@ PROJECT_NUMBER = @VERSION@
# for a project that appears at the top of each page and should give viewer
# a quick idea about the purpose of the project. Keep the description short.
-PROJECT_BRIEF = "Osmocom SDR library"
+PROJECT_BRIEF = "Osmocom DSP library"
# With the PROJECT_LOGO tag one can specify an logo or icon that is
# included in the documentation. The maximum height of the logo should not
@@ -610,7 +610,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = include/osmocom/sdr src
+INPUT = include/osmocom/dsp src
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/Makefile.am b/Makefile.am
index aa66251..ec16da9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libosmosdr.pc
+pkgconfig_DATA = libosmodsp.pc
BUILT_SOURCES = $(top_srcdir)/.version
$(top_srcdir)/.version:
diff --git a/configure.ac b/configure.ac
index 2e3910f..2e60a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libosmo-sdr],
+AC_INIT([libosmodsp],
m4_esyscmd([./git-version-gen .tarball-version]),
[gmr@lists.osmocom.org])
@@ -38,10 +38,10 @@ dnl Generate the output
AM_CONFIG_HEADER(config.h)
AC_OUTPUT(
- libosmosdr.pc
+ libosmodsp.pc
include/Makefile
include/osmocom/Makefile
- include/osmocom/sdr/Makefile
+ include/osmocom/dsp/Makefile
src/Makefile
Makefile
Doxyfile
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index f02c47e..8369d99 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1 +1 @@
-SUBDIRS=sdr
+SUBDIRS=dsp
diff --git a/include/osmocom/dsp/Makefile.am b/include/osmocom/dsp/Makefile.am
new file mode 100644
index 0000000..5a6534f
--- /dev/null
+++ b/include/osmocom/dsp/Makefile.am
@@ -0,0 +1,3 @@
+osmodsp_HEADERS = cfile.h cxvec.h cxvec_math.h
+
+osmodspdir = $(includedir)/osmocom/dsp
diff --git a/include/osmocom/sdr/cfile.h b/include/osmocom/dsp/cfile.h
index ee2e722..be9392e 100644
--- a/include/osmocom/sdr/cfile.h
+++ b/include/osmocom/dsp/cfile.h
@@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __OSMO_SDR_CFILE_H__
-#define __OSMO_SDR_CFILE_H__
+#ifndef __OSMO_DSP_CFILE_H__
+#define __OSMO_DSP_CFILE_H__
/*! \defgroup cfile .cfile helpers
* @{
@@ -47,4 +47,4 @@ void cfile_release(struct cfile *cf);
/*! @} */
-#endif /* __OSMO_SDR_CFILE_H__ */
+#endif /* __OSMO_DSP_CFILE_H__ */
diff --git a/include/osmocom/sdr/cxvec.h b/include/osmocom/dsp/cxvec.h
index 48f60e1..063e30c 100644
--- a/include/osmocom/sdr/cxvec.h
+++ b/include/osmocom/dsp/cxvec.h
@@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __OSMO_SDR_CXVEC_H__
-#define __OSMO_SDR_CXVEC_H__
+#ifndef __OSMO_DSP_CXVEC_H__
+#define __OSMO_DSP_CXVEC_H__
/*! \defgroup cxvec Complex vectors
* @{
@@ -64,4 +64,4 @@ osmo_cxvec_dbg_dump(struct osmo_cxvec *cv, const char *fname);
/*! @} */
-#endif /* __OSMO_SDR_CXVEC_H__ */
+#endif /* __OSMO_DSP_CXVEC_H__ */
diff --git a/include/osmocom/sdr/cxvec_math.h b/include/osmocom/dsp/cxvec_math.h
index 94202f1..d7b580e 100644
--- a/include/osmocom/sdr/cxvec_math.h
+++ b/include/osmocom/dsp/cxvec_math.h
@@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __OSMO_SDR_CXVEC_MATH_H__
-#define __OSMO_SDR_CXVEC_MATH_H__
+#ifndef __OSMO_DSP_CXVEC_MATH_H__
+#define __OSMO_DSP_CXVEC_MATH_H__
/*! \defgroup cxvec_math Complex vectors math and signal processing
* \ingroup cxvec
@@ -37,7 +37,7 @@
#include <complex.h>
#include <math.h>
-#include <osmocom/sdr/cxvec.h>
+#include <osmocom/dsp/cxvec.h>
/* Generic math stuff */
@@ -120,4 +120,4 @@ osmo_cxvec_sig_normalize(struct osmo_cxvec *sig, int decim, float freq_shift,
/*! @} */
-#endif /* __OSMO_SDR_CXVEC_MATH_H__ */
+#endif /* __OSMO_DSP_CXVEC_MATH_H__ */
diff --git a/include/osmocom/sdr/Makefile.am b/include/osmocom/sdr/Makefile.am
deleted file mode 100644
index bbf3c85..0000000
--- a/include/osmocom/sdr/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-osmosdr_HEADERS = cfile.h cxvec.h cxvec_math.h
-
-osmosdrdir = $(includedir)/osmocom/sdr
diff --git a/libosmosdr.pc.in b/libosmodsp.pc.in
index f130eb3..428a1d0 100644
--- a/libosmosdr.pc.in
+++ b/libosmodsp.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: Osmocom SDR Library
+Name: Osmocom DSP Library
Description: C Utility Library
Version: @VERSION@
-Libs: -L${libdir} -losmosdr -lm
+Libs: -L${libdir} -losmodsp -lm
Cflags: -I${includedir}/
diff --git a/src/Makefile.am b/src/Makefile.am
index 4986626..4bf3ddf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ LIBVERSION=0:0:0
INCLUDES = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -fPIC -Wall -ffast-math
-lib_LTLIBRARIES = libosmosdr.la
+lib_LTLIBRARIES = libosmodsp.la
-libosmosdr_la_SOURCES = cfile.c cxvec.c cxvec_math.c
-libosmosdr_la_LDFALGS = -version-info $(LIBVERSION)
+libosmodsp_la_SOURCES = cfile.c cxvec.c cxvec_math.c
+libosmodsp_la_LDFALGS = -version-info $(LIBVERSION)
diff --git a/src/cfile.c b/src/cfile.c
index 253d70f..4fa927f 100644
--- a/src/cfile.c
+++ b/src/cfile.c
@@ -39,7 +39,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <osmocom/sdr/cfile.h>
+#include <osmocom/dsp/cfile.h>
/*! \brief .cfile loader: mmap() the data into memory (read-only)
diff --git a/src/cxvec.c b/src/cxvec.c
index 39bd94c..fcda8af 100644
--- a/src/cxvec.c
+++ b/src/cxvec.c
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <osmocom/sdr/cxvec.h>
+#include <osmocom/dsp/cxvec.h>
/*! \brief Initialize a vector structure with a given data array
* \param[out] cv The vector to be initialized
diff --git a/src/cxvec_math.c b/src/cxvec_math.c
index 2b94939..45df8d2 100644
--- a/src/cxvec_math.c
+++ b/src/cxvec_math.c
@@ -35,8 +35,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <osmocom/sdr/cxvec.h>
-#include <osmocom/sdr/cxvec_math.h>
+#include <osmocom/dsp/cxvec.h>
+#include <osmocom/dsp/cxvec_math.h>
/*! \brief Scale a complex vector (multiply by a constant)
* \param[in] in Input complex vector