diff options
author | Ivan Kluchnikov <kluchnikovi@gmail.com> | 2012-06-26 16:54:22 +0400 |
---|---|---|
committer | Ivan Kluchnikov <kluchnikovi@gmail.com> | 2012-06-26 16:54:22 +0400 |
commit | cf7b3a529fe35e1cac38baa1cdcb9e88899fc694 (patch) | |
tree | 30f8362f16cbe7c3ac69c9f168c462d54073b5ff /src/Makefile.am | |
parent | 477e79e67e82f315d71721b67a07e0aed540b460 (diff) | |
parent | 7d7cf54f39b9136749d47336576688ce150be49d (diff) |
Merge branch 'jolly'
Merged jolly branch with master, fixed conflicts.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 196e3c22..b7b9885a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,8 +18,12 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -AM_CXXFLAGS = -Wall -ldl -pthread +# FIXME: This has to go!! +OPENBSC_DIR = $(top_srcdir)/../openbsc/openbsc +OPENGGSN_DIR = $(top_srcdir)/../openggsn + +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -I$(OPENBSC_DIR)/include +AM_CXXFLAGS = -Wall -ldl -pthread -lgtp noinst_LTLIBRARIES = libgprs.la @@ -29,10 +33,17 @@ libgprs_la_SOURCES = \ gsm_rlcmac.cpp \ gprs_bssgp_pcu.cpp \ gprs_rlcmac.cpp \ - pcu_l1_if.cpp \ gsm_timer.cpp \ bitvector.cpp +if ENABLE_SYSMOBTS +libgprs_la_SOURCES += \ + sysmo_l1_if.cpp +else +libgprs_la_SOURCES += \ + pcu_l1_if.cpp +endif + noinst_PROGRAMS = \ RLCMACTest \ pcu |