diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:37 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:45 +0100 |
| commit | 1ebad7437729d6abbf5308de19161b0574e3451a (patch) | |
| tree | 1229a0bfb2bb0093dec05959fd4bbfca557d64c9 /openbsc/tests/db | |
| parent | 36ed8cc4c33e3b69bb0f84f1b5b593ae46aff08f (diff) | |
| parent | 140f6e9b12fcb83d161dc1cd8c5d6972ef86fc7c (diff) | |
Merge remote branch 'origin/master' into on-waves/mgcp
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/src/Makefile.am
Diffstat (limited to 'openbsc/tests/db')
| -rw-r--r-- | openbsc/tests/db/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsc/tests/db/Makefile.am b/openbsc/tests/db/Makefile.am index 8ce7e3c49..6eb9180ce 100644 --- a/openbsc/tests/db/Makefile.am +++ b/openbsc/tests/db/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) noinst_PROGRAMS = db_test db_test_SOURCES = db_test.c -db_test_LDADD = $(top_builddir)/src/libbsc.a $(top_builddir)/src/libmsc.a $(top_builddir)/src/libbsc.a -ldl -ldbi +db_test_LDADD = $(top_builddir)/src/libbsc.a $(top_builddir)/src/libmsc.a $(top_builddir)/src/libbsc.a $(LIBOSMOCORE_LIBS) -ldl -ldbi |