diff options
| author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-04-26 02:55:30 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-04-26 02:55:30 +0200 |
| commit | ade79a00838801dbcd95efd026d18b15eb1e1e3c (patch) | |
| tree | 6b08d76dcee3abe022770fee6fd52b16d322c79e /src/host/gsmmap | |
| parent | f0059596a20bfa406a500ca5d6b34bf88d333ed3 (diff) | |
src: use new libosmogsm and include/osmocom/[gsm|core] path to headers
This patch changes include paths to get osmocom-bb working with
the current libosmocore tree.
Among all these renames, you can notice several tweaks that I
added on purpose, and that require some explanation, they are:
* hexdump() in osmocon.c and osmoload.c has been renamed to avoid
clashing with hexdump() defined in libosmocore.
* gsmmap now depends on libosmogsm. Actually I had to cleanup
Makefile.am because I was experiencing weird linking problems,
probably due to a bug in the autotools. With the change included
in this patch, I got it compiled and linked here correctly.
This patch has been tested with the phone Motorola C123 and the
following images files:
* firmware/board/compal_e88/hello_world.compalram.bin
* firmware/board/compal_e88/layer1.compalram.bin
Using the osmocon, bcch_scan and mobile tools.
Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org>
Diffstat (limited to 'src/host/gsmmap')
| -rw-r--r-- | src/host/gsmmap/Makefile.am | 7 | ||||
| -rw-r--r-- | src/host/gsmmap/configure.ac | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/host/gsmmap/Makefile.am b/src/host/gsmmap/Makefile.am index d866d02e..e71b887c 100644 --- a/src/host/gsmmap/Makefile.am +++ b/src/host/gsmmap/Makefile.am @@ -7,12 +7,11 @@ $(top_srcdir)/.version: dist-hook: echo $(VERSION) > $(distdir)/.tarball-version -INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) +INCLUDES = $(all_includes) -I../layer23/include -DHOST_BUILD +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) sbin_PROGRAMS = gsmmap -INCLUDES += -I../layer23/include -DHOST_BUILD gsmmap_SOURCES = gsmmap.c geo.c locate.c log.c ../layer23/src/common/sysinfo.c ../layer23/src/common/networks.c -gsmmap_LDADD = $(LIBOSMOCORE_LIBS) -lm +gsmmap_LDADD = $(LIBOSMOGSM_LIBS) $(LIBOSMOCORE_LIBS) -lm diff --git a/src/host/gsmmap/configure.ac b/src/host/gsmmap/configure.ac index 45a00e2e..3a42d4c3 100644 --- a/src/host/gsmmap/configure.ac +++ b/src/host/gsmmap/configure.ac @@ -15,6 +15,7 @@ AC_PROG_INSTALL dnl checks for libraries PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm) dnl checks for header files AC_HEADER_STDC |