[MERGED] libosmocore[master]: build: fix build dependencies for generated sources

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Mon Mar 20 13:55:41 UTC 2017


Neels Hofmeyr has submitted this change and it was merged.

Change subject: build: fix build dependencies for generated sources
......................................................................


build: fix build dependencies for generated sources

Ensure that a changed conv_gen.py and/or conv_codes_gsm.py result in
regeneration of the gsm0503* generated sources. Before this patch, manual
cleaning of the generated files was necessary to benefit from a code update.

Change-Id: Ib4328662c21280c0ea6aa9391a64ada2c6598704
---
M include/Makefile.am
M src/gsm/Makefile.am
2 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/Makefile.am b/include/Makefile.am
index 7d0b384..e2a1b12 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,5 @@
+BUILT_SOURCES = osmocom/gsm/gsm0503.h
+
 nobase_include_HEADERS = \
                        osmocom/codec/codec.h \
                        osmocom/core/application.h \
@@ -149,7 +151,7 @@
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
 
-osmocom/gsm/gsm0503.h:
+osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
 	$(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_header gsm \
 		--target-path $(builddir)/osmocom/gsm
 
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index 653bdb9..3a4a0cd 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -14,6 +14,8 @@
 noinst_LTLIBRARIES = libgsmint.la
 lib_LTLIBRARIES = libosmogsm.la
 
+BUILT_SOURCES = gsm0503_conv.c
+
 libgsmint_la_SOURCES =  a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \
 			gsm_utils.c rsl.c gsm48.c gsm48_ie.c gsm0808.c sysinfo.c \
 			gprs_cipher_core.c gprs_rlc.c gsm0480.c abis_nm.c gsm0502.c \
@@ -34,7 +36,7 @@
 EXTRA_DIST = libosmogsm.map
 
 # Convolutional codes generation
-gsm0503_conv.c:
+gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
 	$(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_codes gsm
 
 CLEANFILES = gsm0503_conv.c

-- 
To view, visit https://gerrit.osmocom.org/2002
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4328662c21280c0ea6aa9391a64ada2c6598704
Gerrit-PatchSet: 5
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>



More information about the gerrit-log mailing list