From 8fda362dd8b30e921e8384ebe9f8afa3bed052fa Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Wed, 6 Jan 2016 14:18:51 +0100 Subject: Correct postprocessing of generated files Rewrite ranap_common.h include path in ranap_ies_defs.h as well Don't move ranap_ies_defs.h to the install directory, but move it inside the source tree --- src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f07f457..29daeb5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,12 +13,12 @@ rua_encoder.c rua_decoder.c rua_ies_defs.h: $(ASN1_ROOT)/rua/RUA-PDU-Contents.as ranap_encoder.c ranap_decoder.c: $(ASN1_ROOT)/ranap/RANAP-PDU-Contents.asn $(ASN1TOSTRUCT) $(ASN1TOSTRUCT) -p RANAP_ -f $< - mv ranap_ies_defs.h $(includedir)/osmocom/ranap/ -# this is ugly ^. ranap_ies_defs.h is generated from asn1tostruct.py here, but -# it should live in include/osmocom/ranap/. # We also need to replace the include in the newly generated .c files: sed -i 's,^#include "ranap_ies_defs.h",#include ,' ranap_encoder.c ranap_decoder.c - sed -i 's,^#include "ranap_common.h",#include ,' ranap_encoder.c ranap_decoder.c + sed -i 's,^#include "ranap_common.h",#include ,' ranap_encoder.c ranap_decoder.c ranap_ies_defs.h + mv ranap_ies_defs.h $(top_srcdir)/include/osmocom/ranap/ +# this is ugly ^. ranap_ies_defs.h is generated from asn1tostruct.py here, but +# it should live in include/osmocom/ranap/. AM_CFLAGS = $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -I../include COMMON_LDADD = -lsctp -- cgit v1.2.3