aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2016-05-13 10:27:35 +0200
committerHolger Freyther <holger@freyther.de>2016-05-17 16:19:32 +0000
commitde810f2005b7a97fa8385d42f0a2399ceff6452a (patch)
treea0d1ae2d9f9ffec41474fca73b1550d006702b97
parentcad867ec8d550638065d1115ef2a6296cfe557db (diff)
Restructure sources
Move hardware-spicefic files into subdirectory similar to the way it's done in OsmoBTS to make adding new hardware support easier. Change-Id: I05004ad9032759a5dbfa57290ed1df83e89d5cb8 Related: SYS#2443 Reviewed-on: https://gerrit.osmocom.org/58 Tested-by: Jenkins Builder Reviewed-by: Holger Freyther <holger@freyther.de>
-rw-r--r--src/Makefile.am49
-rw-r--r--src/osmo-bts-sysmo/femtobts.c (renamed from src/femtobts.c)0
-rw-r--r--src/osmo-bts-sysmo/femtobts.h (renamed from src/femtobts.h)0
-rw-r--r--src/osmo-bts-sysmo/sysmo_l1_fwd.c (renamed from src/sysmo_l1_fwd.c)0
-rw-r--r--src/osmo-bts-sysmo/sysmo_l1_hw.c (renamed from src/sysmo_l1_hw.c)0
-rw-r--r--src/osmo-bts-sysmo/sysmo_l1_if.c (renamed from src/sysmo_l1_if.c)0
-rw-r--r--src/osmo-bts-sysmo/sysmo_l1_if.h (renamed from src/sysmo_l1_if.h)0
7 files changed, 29 insertions, 20 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 832c3b0..3049744 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,11 +64,6 @@ bin_PROGRAMS = \
noinst_PROGRAMS =
-if ENABLE_SYSMODSP
-noinst_PROGRAMS += \
- osmo-pcu-remote
-endif
-
noinst_HEADERS = \
gprs_debug.h \
csn1.h \
@@ -83,8 +78,6 @@ noinst_HEADERS = \
bitvector.h \
pcu_vty.h \
pcu_vty_functions.h \
- sysmo_l1_if.h \
- femtobts.h \
tbf.h \
bts.h \
poll_controller.h \
@@ -101,30 +94,46 @@ noinst_HEADERS = \
osmo_pcu_SOURCES = pcu_main.cpp
if ENABLE_SYSMODSP
-osmo_pcu_SOURCES += sysmo_l1_if.c \
- sysmo_l1_hw.c \
- femtobts.c
-
-osmo_pcu_remote_SOURCES = pcu_main.cpp \
- sysmo_l1_if.c \
- sysmo_l1_fwd.c \
- femtobts.c
-endif
+AM_CPPFLAGS += -I$(srcdir)/osmo-bts-sysmo
-osmo_pcu_LDADD = \
+EXTRA_DIST = \
+ osmo-bts-sysmo/sysmo_l1_if.c \
+ osmo-bts-sysmo/sysmo_l1_if.h \
+ osmo-bts-sysmo/sysmo_l1_hw.c \
+ osmo-bts-sysmo/femtobts.c \
+ osmo-bts-sysmo/femtobts.h
+
+noinst_HEADERS += \
+ osmo-bts-sysmo/sysmo_l1_if.h \
+ osmo-bts-sysmo/femtobts.h
+
+noinst_PROGRAMS += \
+ osmo-pcu-remote
+
+osmo_pcu_SOURCES += \
+ osmo-bts-sysmo/sysmo_l1_if.c \
+ osmo-bts-sysmo/sysmo_l1_hw.c \
+ osmo-bts-sysmo/femtobts.c
+
+osmo_pcu_remote_SOURCES = \
+ pcu_main.cpp \
+ osmo-bts-sysmo/sysmo_l1_if.c \
+ osmo-bts-sysmo/sysmo_l1_fwd.c \
+ osmo-bts-sysmo/femtobts.c
+
+osmo_pcu_remote_LDADD = \
libgprs.la \
$(LIBOSMOGB_LIBS) \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(COMMON_LA)
+endif
-if ENABLE_SYSMODSP
-osmo_pcu_remote_LDADD = \
+osmo_pcu_LDADD = \
libgprs.la \
$(LIBOSMOGB_LIBS) \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(COMMON_LA)
-endif
#MOSTLYCLEANFILES += testSource testDestination
diff --git a/src/femtobts.c b/src/osmo-bts-sysmo/femtobts.c
index f6957d2..f6957d2 100644
--- a/src/femtobts.c
+++ b/src/osmo-bts-sysmo/femtobts.c
diff --git a/src/femtobts.h b/src/osmo-bts-sysmo/femtobts.h
index 7e45578..7e45578 100644
--- a/src/femtobts.h
+++ b/src/osmo-bts-sysmo/femtobts.h
diff --git a/src/sysmo_l1_fwd.c b/src/osmo-bts-sysmo/sysmo_l1_fwd.c
index 535a7f0..535a7f0 100644
--- a/src/sysmo_l1_fwd.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_fwd.c
diff --git a/src/sysmo_l1_hw.c b/src/osmo-bts-sysmo/sysmo_l1_hw.c
index 8351d68..8351d68 100644
--- a/src/sysmo_l1_hw.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_hw.c
diff --git a/src/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c
index c7c54dd..c7c54dd 100644
--- a/src/sysmo_l1_if.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_if.c
diff --git a/src/sysmo_l1_if.h b/src/osmo-bts-sysmo/sysmo_l1_if.h
index 6b50d4e..6b50d4e 100644
--- a/src/sysmo_l1_if.h
+++ b/src/osmo-bts-sysmo/sysmo_l1_if.h