Skip to content

Commit

Permalink
add autotools based build system
Browse files Browse the repository at this point in the history
  • Loading branch information
Dimitri Stolnikov committed Mar 27, 2012
1 parent 37bb5ca commit 001bfb9
Show file tree
Hide file tree
Showing 18 changed files with 2,340 additions and 17 deletions.
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Steve Markgraf <steve@steve-m.de>
Dimitri Stolnikov <horiz0n@gmx.net>
339 changes: 339 additions & 0 deletions COPYING

Large diffs are not rendered by default.

1,716 changes: 1,716 additions & 0 deletions Doxyfile.in

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
ACLOCAL_AMFLAGS = -I m4

INCLUDES = $(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = librtlsdr.pc

BUILT_SOURCES = $(top_srcdir)/.version
$(top_srcdir)/.version:
echo $(VERSION) > $@-t && mv $@-t $@
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version

EXTRA_DIST = git-version-gen

if HAVE_DOXYGEN

pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION)
doc_htmldir=$(pkgdocdir)/html

doc_html_DATA = $(top_builddir)/doc/html.tar

$(doc_html_DATA): $(top_builddir)/doc/html/index.html
cd $(top_builddir)/doc && tar cf html.tar html

$(top_builddir)/doc/html/index.html: $(SOURCES) Doxyfile
@rm -rf doc
mkdir -p doc
$(DOXYGEN) Doxyfile

install-data-hook:
cd $(DESTDIR)$(doc_htmldir) && tar xf html.tar --strip-components 1 && rm -f html.tar

uninstall-hook:
cd $(DESTDIR) && rm -rf $(doc_htmldir)

DX_CLEAN = doc/{html,latex}/* doc/html.tar

endif

MOSTLYCLEANFILES = $(DX_CLEAN)
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
rtl-sdr
Software to turn the Realtek RTL2832U into a SDR
Software to turn Realtek RTL2832U based DVB-T receivers into SDR
======================================================================

For more information see:
Expand Down
50 changes: 50 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
AC_INIT([librtlsdr],
m4_esyscmd([./git-version-gen .tarball-version]),
[osmosdr@lists.osmocom.org])

AM_INIT_AUTOMAKE([dist-bzip2])

dnl kernel style compile messages
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

dnl checks for programs
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_INSTALL
LT_INIT
AC_PROG_LIBTOOL

PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0)
LIBS="$LIBS $LIBUSB_LIBS"
CFLAGS="$CFLAGS $LIBUSB_CFLAGS"

AC_PATH_PROG(DOXYGEN,doxygen,false)
AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false)

AC_CONFIG_MACRO_DIR([m4])

dnl checks for header files
AC_HEADER_STDC
AC_CHECK_HEADERS(sys/types.h)

# The following test is taken from WebKit's webkit.m4
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fvisibility=hidden "
AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
[ AC_MSG_RESULT([yes])
SYMBOL_VISIBILITY="-fvisibility=hidden"],
AC_MSG_RESULT([no]))
CFLAGS="$saved_CFLAGS"
AC_SUBST(SYMBOL_VISIBILITY)

dnl Generate the output
AM_CONFIG_HEADER(config.h)

AC_OUTPUT(
librtlsdr.pc
include/Makefile
src/Makefile
Makefile
Doxyfile
)
151 changes: 151 additions & 0 deletions git-version-gen
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
#!/bin/sh
# Print a version string.
scriptversion=2010-01-28.01

# Copyright (C) 2007-2010 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 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/>.

# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
# It may be run two ways:
# - from a git repository in which the "git describe" command below
# produces useful output (thus requiring at least one signed tag)
# - from a non-git-repo directory containing a .tarball-version file, which
# presumes this script is invoked like "./git-version-gen .tarball-version".

# In order to use intra-version strings in your project, you will need two
# separate generated version string files:
#
# .tarball-version - present only in a distribution tarball, and not in
# a checked-out repository. Created with contents that were learned at
# the last time autoconf was run, and used by git-version-gen. Must not
# be present in either $(srcdir) or $(builddir) for git-version-gen to
# give accurate answers during normal development with a checked out tree,
# but must be present in a tarball when there is no version control system.
# Therefore, it cannot be used in any dependencies. GNUmakefile has
# hooks to force a reconfigure at distribution time to get the value
# correct, without penalizing normal development with extra reconfigures.
#
# .version - present in a checked-out repository and in a distribution
# tarball. Usable in dependencies, particularly for files that don't
# want to depend on config.h but do want to track version changes.
# Delete this file prior to any autoconf run where you want to rebuild
# files to pick up a version string change; and leave it stale to
# minimize rebuild time after unrelated changes to configure sources.
#
# It is probably wise to add these two files to .gitignore, so that you
# don't accidentally commit either generated file.
#
# Use the following line in your configure.ac, so that $(VERSION) will
# automatically be up-to-date each time configure is run (and note that
# since configure.ac no longer includes a version string, Makefile rules
# should not depend on configure.ac for version updates).
#
# AC_INIT([GNU project],
# m4_esyscmd([build-aux/git-version-gen .tarball-version]),
# [bug-project@example])
#
# Then use the following lines in your Makefile.am, so that .version
# will be present for dependencies, and so that .tarball-version will
# exist in distribution tarballs.
#
# BUILT_SOURCES = $(top_srcdir)/.version
# $(top_srcdir)/.version:
# echo $(VERSION) > $@-t && mv $@-t $@
# dist-hook:
# echo $(VERSION) > $(distdir)/.tarball-version

case $# in
1) ;;
*) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
esac

tarball_version_file=$1
nl='
'

# First see if there is a tarball-only version file.
# then try "git describe", then default.
if test -f $tarball_version_file
then
v=`cat $tarball_version_file` || exit 1
case $v in
*$nl*) v= ;; # reject multi-line output
[0-9]*) ;;
*) v= ;;
esac
test -z "$v" \
&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
fi

if test -n "$v"
then
: # use $v
elif
v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
|| git describe --abbrev=4 HEAD 2>/dev/null` \
&& case $v in
[0-9]*) ;;
v[0-9]*) ;;
*) (exit 1) ;;
esac
then
# Is this a new git that lists number of commits since the last
# tag or the previous older version that did not?
# Newer: v6.10-77-g0f8faeb
# Older: v6.10-g0f8faeb
case $v in
*-*-*) : git describe is okay three part flavor ;;
*-*)
: git describe is older two part flavor
# Recreate the number of commits and rewrite such that the
# result is the same as if we were using the newer version
# of git describe.
vtag=`echo "$v" | sed 's/-.*//'`
numcommits=`git rev-list "$vtag"..HEAD | wc -l`
v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
;;
esac

# Change the first '-' to a '.', so version-comparing tools work properly.
# Remove the "g" in git describe's output string, to save a byte.
v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
else
v=UNKNOWN
fi

v=`echo "$v" |sed 's/^v//'`

# Don't declare a version "dirty" merely because a time stamp has changed.
git status > /dev/null 2>&1

dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
case "$dirty" in
'') ;;
*) # Append the suffix only if there isn't one already.
case $v in
*-dirty) ;;
*) v="$v-dirty" ;;
esac ;;
esac

# Omit the trailing newline, so that m4_esyscmd can use the result directly.
echo "$v" | tr -d '\012'

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:
5 changes: 5 additions & 0 deletions include/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
rtlsdr_HEADERS = rtl-sdr.h

noinst_HEADERS = i2c.h tuner_e4000.h tuner_fc0013.h

rtlsdrdir = $(includedir)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 10 additions & 0 deletions librtlsdr.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: RTL-SDR Library
Description: C Utility Library
Version: @VERSION@
Libs: -L${libdir} -lrtlsdr -lusb-1.0
Cflags: -I${includedir}/
2 changes: 2 additions & 0 deletions m4/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/libtool.m4
/lt*.m4
10 changes: 0 additions & 10 deletions src/Makefile

This file was deleted.

15 changes: 15 additions & 0 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This is _NOT_ the library release version, it's an API version.
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
LIBVERSION=0:0:0

INCLUDES = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -fPIC -Wall

lib_LTLIBRARIES = librtlsdr.la

librtlsdr_la_SOURCES = rtl-sdr.c tuner_e4000.c tuner_fc0013.c
librtlsdr_la_LDFALGS = -version-info $(LIBVERSION)

bin_PROGRAMS = rtl_sdr
rtl_sdr_SOURCES = main.c
rtl_sdr_LDADD = librtlsdr.la
4 changes: 2 additions & 2 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static int do_exit = 0;

void usage(void)
{
printf("rtl-sdr, an I/Q recorder for RTL2832 based USB-sticks\n\n"
printf("rtl-sdr, an I/Q recorder for RTL2832 based DVB-T receivers\n\n"
"Usage:\t -f frequency to tune to [Hz]\n"
"\t[-s samplerate (default: 2048000 Hz)]\n"
"\toutput filename\n");
Expand All @@ -48,7 +48,7 @@ int main(int argc, char **argv)
{
struct sigaction sigact;
int r, opt;
char *filename;
char *filename = NULL;
uint32_t frequency = 0, samp_rate = 2048000;
uint8_t buffer[READLEN];
uint32_t n_read;
Expand Down
8 changes: 4 additions & 4 deletions src/rtl-sdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ uint32_t rtlsdr_get_device_count(void)
{
int i, j;
libusb_device **list;
uint32_t device_count;
uint32_t device_count = 0;
struct libusb_device_descriptor dd;

ssize_t cnt = libusb_get_device_list(NULL, &list);
Expand All @@ -424,7 +424,7 @@ const char *rtlsdr_get_device_name(uint32_t index)
libusb_device **list;

ssize_t cnt = libusb_get_device_list(NULL, &list);

if (index > cnt - 1)
return NULL;

Expand All @@ -451,7 +451,7 @@ rtlsdr_dev_t *rtlsdr_open(int index)
memset(dev, 0, sizeof(rtlsdr_dev_t));

ssize_t cnt = libusb_get_device_list(NULL, &list);

for (i = 0; i < cnt; i++) {
device = list[i];

Expand Down Expand Up @@ -483,7 +483,7 @@ rtlsdr_dev_t *rtlsdr_open(int index)
}

libusb_free_device_list(list, 0);

unsigned char buffer[256];

libusb_get_string_descriptor_ascii(dev->devh, 0, buffer, sizeof(buffer) );
Expand Down

0 comments on commit 001bfb9

Please sign in to comment.