diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-03-18 13:21:26 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-03-18 13:27:42 +0100 |
| commit | 01ddd10c5a59aedd8fbc9930e860331981862c90 (patch) | |
| tree | afa15abeafbcb1f8efd1583bdd3962e36bd294eb | |
| parent | 6f05e0d95f6f1c7f97ed596adcb2522bbb3dad9f (diff) | |
cosmetic: move gsm_data_shared.c to libcommon-cs
Since other projects also include gsm_data_shared.c and expect it to live in
libcommon, this commit may cause failing builds elsewhere. Same goes for the
debian/openbsc-dev package.
I considered having gsm_data_shared.c in both locations, but it doesn't really
make sense unless we want to keep duplicates for all eternity. At some point
users of this should be adjusted anyway.
Change-Id: Ie2cacc869a1991a40ea36dbce1ad5a0123f51852
| -rw-r--r-- | debian/openbsc-dev.install | 2 | ||||
| -rw-r--r-- | openbsc/src/libcommon-cs/Makefile.am | 1 | ||||
| -rw-r--r-- | openbsc/src/libcommon-cs/gsm_data_shared.c (renamed from openbsc/src/libcommon/gsm_data_shared.c) | 0 | ||||
| -rw-r--r-- | openbsc/src/libcommon/Makefile.am | 1 | ||||
| -rw-r--r-- | openbsc/src/utils/Makefile.am | 1 |
5 files changed, 3 insertions, 2 deletions
diff --git a/debian/openbsc-dev.install b/debian/openbsc-dev.install index 398321af6..10fa7a06b 100644 --- a/debian/openbsc-dev.install +++ b/debian/openbsc-dev.install @@ -1,3 +1,3 @@ openbsc/include/openbsc/gsm_data_shared.h usr/src/osmocom/openbsc/openbsc/include/openbsc/ openbsc/include/openbsc/common_cs.h usr/src/osmocom/openbsc/openbsc/include/openbsc/ -openbsc/src/libcommon/gsm_data_shared.c usr/src/osmocom/openbsc/openbsc/src/libcommon/ +openbsc/src/libcommon-cs/gsm_data_shared.c usr/src/osmocom/openbsc/openbsc/src/libcommon-cs/ diff --git a/openbsc/src/libcommon-cs/Makefile.am b/openbsc/src/libcommon-cs/Makefile.am index ad1376a04..d4c9740d8 100644 --- a/openbsc/src/libcommon-cs/Makefile.am +++ b/openbsc/src/libcommon-cs/Makefile.am @@ -19,4 +19,5 @@ libcommon_cs_a_SOURCES = \ common_cs.c \ common_cs_vty.c \ gsm_data.c \ + gsm_data_shared.c \ $(NULL) diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon-cs/gsm_data_shared.c index 387af7068..387af7068 100644 --- a/openbsc/src/libcommon/gsm_data_shared.c +++ b/openbsc/src/libcommon-cs/gsm_data_shared.c diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am index d7e956c3e..714612ff1 100644 --- a/openbsc/src/libcommon/Makefile.am +++ b/openbsc/src/libcommon/Makefile.am @@ -21,7 +21,6 @@ libcommon_a_SOURCES = \ bsc_version.c \ common_vty.c \ debug.c \ - gsm_data_shared.c \ gsup_client.c \ oap_client.c \ socket.c \ diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index ab4f3ced6..ceef708ed 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/Makefile.am @@ -129,6 +129,7 @@ meas_json_SOURCES = \ meas_json_LDADD = \ $(top_builddir)/src/libcommon/libcommon.a \ + $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(NULL) |