From 83457922813ace30efa355ed00b8967e64218aee Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <nhofmeyr@sysmocom.de>
Date: Fri, 26 Aug 2016 23:56:44 +0200
Subject: build: fix ranap gen, use same for gen hnbap and rua gen

fix extraneous rebuild for each make invocation: touch the ranap.stamp file in
src/ as the make target suggests.

fix for 'make distcheck': ranap gen: move generated sources to builddir, not
srcdir. Thus we also -I the builddir include to pick up those headers.

hnbap and rua have the same situation as ranap (they generate numerous files
from a single make rule). Use the same makefile semantics for those two
(commit for ranap gen omitted the same changes for hnbap and rua).

The generated headers are thus moved to include/osmocom/*/, so adjust #include
statements accordingly (*_common.h, *_ies_defs.h).

Also move hnbap_common.h to include/osmocom/hnbap and rua_common.h to
include/osmocom/rua, since the *_ies_defs.h want to include them; and since
*_ies_defs.h are now in include/osmocom/*, we want a '<foo>' include now.

Also adjust gitignore.

Change-Id: I32213666fcdfc144008fa7d46497c0938d093e86
---
 include/osmocom/hnbap/Makefile.am    |   1 +
 include/osmocom/hnbap/hnbap_common.h | 159 +++++++++++++++++++++++++++++++++++
 include/osmocom/ranap/Makefile.am    |   4 +-
 include/osmocom/rua/Makefile.am      |   1 +
 include/osmocom/rua/rua_common.h     |  71 ++++++++++++++++
 5 files changed, 234 insertions(+), 2 deletions(-)
 create mode 100644 include/osmocom/hnbap/hnbap_common.h
 create mode 100644 include/osmocom/rua/rua_common.h

(limited to 'include')

diff --git a/include/osmocom/hnbap/Makefile.am b/include/osmocom/hnbap/Makefile.am
index 7ab5d7f..83654cb 100644
--- a/include/osmocom/hnbap/Makefile.am
+++ b/include/osmocom/hnbap/Makefile.am
@@ -1,4 +1,5 @@
 noinst_HEADERS = \
+	hnbap_common.h hnbap_ies_defs.h \
 	AccessResult.h \
 	Access-stratum-release-indicator.h \
 	AdditionalNeighbourInfoList.h \
diff --git a/include/osmocom/hnbap/hnbap_common.h b/include/osmocom/hnbap/hnbap_common.h
new file mode 100644
index 0000000..25cb2f0
--- /dev/null
+++ b/include/osmocom/hnbap/hnbap_common.h
@@ -0,0 +1,159 @@
+#pragma once
+
+#include "asn_application.h"
+
+#include <ANY.h>
+#include <BIT_STRING.h>
+#include <INTEGER.h>
+#include <NativeEnumerated.h>
+#include <NativeInteger.h>
+#include <OBJECT_IDENTIFIER.h>
+#include <OCTET_STRING.h>
+
+#include <osmocom/hnbap/Access-stratum-release-indicator.h>
+#include <osmocom/hnbap/AccessResult.h>
+#include <osmocom/hnbap/AdditionalNeighbourInfoList.h>
+#include <osmocom/hnbap/AltitudeAndDirection.h>
+#include <osmocom/hnbap/BackoffTimer.h>
+#include <osmocom/hnbap/BindingID.h>
+#include <osmocom/hnbap/CELL-FACHMobilitySupport.h>
+#include <osmocom/hnbap/CGI.h>
+#include <osmocom/hnbap/CI.h>
+#include <osmocom/hnbap/CN-DomainIndicator.h>
+#include <osmocom/hnbap/CSG-Capability.h>
+#include <osmocom/hnbap/CSG-ID.h>
+#include <osmocom/hnbap/CSGMembershipStatus.h>
+#include <osmocom/hnbap/CSGMembershipUpdate.h>
+#include <osmocom/hnbap/Cause.h>
+#include <osmocom/hnbap/CauseMisc.h>
+#include <osmocom/hnbap/CauseProtocol.h>
+#include <osmocom/hnbap/CauseRadioNetwork.h>
+#include <osmocom/hnbap/CauseTransport.h>
+#include <osmocom/hnbap/CellIdentity.h>
+#include <osmocom/hnbap/ConfigurationInformation.h>
+#include <osmocom/hnbap/Context-ID.h>
+#include <osmocom/hnbap/Criticality.h>
+#include <osmocom/hnbap/CriticalityDiagnostics-IE-List.h>
+#include <osmocom/hnbap/CriticalityDiagnostics.h>
+#include <osmocom/hnbap/ESN.h>
+#include <osmocom/hnbap/ErrorIndication.h>
+#include <osmocom/hnbap/GTP-TEI.h>
+#include <osmocom/hnbap/GeographicalCoordinates.h>
+#include <osmocom/hnbap/GeographicalLocation.h>
+#include <osmocom/hnbap/HNB-Cell-Access-Mode.h>
+#include <osmocom/hnbap/HNB-Cell-Identifier.h>
+#include <osmocom/hnbap/HNB-GWResponse.h>
+#include <osmocom/hnbap/HNB-Identity-Info.h>
+#include <osmocom/hnbap/HNB-Identity.h>
+#include <osmocom/hnbap/HNB-Location-Information.h>
+#include <osmocom/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/hnbap/HNBAP-PDU.h>
+#include <osmocom/hnbap/HNBCapacity.h>
+#include <osmocom/hnbap/HNBConfigInfo.h>
+#include <osmocom/hnbap/HNBConfigTransferRequest.h>
+#include <osmocom/hnbap/HNBConfigTransferResponse.h>
+#include <osmocom/hnbap/HNBConfigurationInformationMissing.h>
+#include <osmocom/hnbap/HNBConfigurationInformationProvided.h>
+#include <osmocom/hnbap/HNBDe-Register.h>
+#include <osmocom/hnbap/HNBRegisterAccept.h>
+#include <osmocom/hnbap/HNBRegisterReject.h>
+#include <osmocom/hnbap/HNBRegisterRequest.h>
+#include <osmocom/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE.h>
+#include <osmocom/hnbap/IMEI.h>
+#include <osmocom/hnbap/IMSI.h>
+#include <osmocom/hnbap/IMSIDS41.h>
+#include <osmocom/hnbap/IMSIESN.h>
+#include <osmocom/hnbap/IP-Address.h>
+#include <osmocom/hnbap/InitiatingMessage.h>
+#include <osmocom/hnbap/Ipv4Address.h>
+#include <osmocom/hnbap/Ipv6Address.h>
+#include <osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h>
+#include <osmocom/hnbap/LAC.h>
+#include <osmocom/hnbap/LAI.h>
+#include <osmocom/hnbap/MacroCellID.h>
+#include <osmocom/hnbap/MacroCoverageInformation.h>
+#include <osmocom/hnbap/MuxPortNumber.h>
+#include <osmocom/hnbap/NeighbourCellIdentityList.h>
+#include <osmocom/hnbap/NeighbourIdentity.h>
+#include <osmocom/hnbap/NeighbourInfoList.h>
+#include <osmocom/hnbap/NeighbourInfoRequestItem.h>
+#include <osmocom/hnbap/NeighbourInfoRequestList.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/PSC.h>
+#include <osmocom/hnbap/PTMSI.h>
+#include <osmocom/hnbap/PTMSIRAI.h>
+#include <osmocom/hnbap/Presence.h>
+#include <osmocom/hnbap/PrivateIE-ID.h>
+#include <osmocom/hnbap/PrivateMessage.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/ProtocolIE-ID.h>
+#include <osmocom/hnbap/RAB-ID.h>
+#include <osmocom/hnbap/RABList.h>
+#include <osmocom/hnbap/RABListItem.h>
+#include <osmocom/hnbap/RAC.h>
+#include <osmocom/hnbap/RAI.h>
+#include <osmocom/hnbap/RNC-ID.h>
+#include <osmocom/hnbap/Registration-Cause.h>
+#include <osmocom/hnbap/RelocationComplete.h>
+#include <osmocom/hnbap/S-RNTIPrefix.h>
+#include <osmocom/hnbap/SAC.h>
+#include <osmocom/hnbap/SuccessfulOutcome.h>
+#include <osmocom/hnbap/TMSIDS41.h>
+#include <osmocom/hnbap/TMSILAI.h>
+#include <osmocom/hnbap/TNLUpdateFailure.h>
+#include <osmocom/hnbap/TNLUpdateRequest.h>
+#include <osmocom/hnbap/TNLUpdateResponse.h>
+#include <osmocom/hnbap/TransportInfo.h>
+#include <osmocom/hnbap/TransportLayerAddress.h>
+#include <osmocom/hnbap/TriggeringMessage.h>
+#include <osmocom/hnbap/Tunnel-Information.h>
+#include <osmocom/hnbap/TypeOfError.h>
+#include <osmocom/hnbap/U-RNTI.h>
+#include <osmocom/hnbap/U-RNTIQueryRequest.h>
+#include <osmocom/hnbap/U-RNTIQueryResponse.h>
+#include <osmocom/hnbap/UDP-Port-Number.h>
+#include <osmocom/hnbap/UE-Capabilities.h>
+#include <osmocom/hnbap/UE-Identity.h>
+#include <osmocom/hnbap/UEDe-Register.h>
+#include <osmocom/hnbap/UERegisterAccept.h>
+#include <osmocom/hnbap/UERegisterReject.h>
+#include <osmocom/hnbap/UERegisterRequest.h>
+#include <osmocom/hnbap/URAIdentity.h>
+#include <osmocom/hnbap/URAIdentityList.h>
+#include <osmocom/hnbap/UTRANCellID.h>
+#include <osmocom/hnbap/UnknownU-RNTIIndication.h>
+#include <osmocom/hnbap/UnsuccessfulOutcome.h>
+#include <osmocom/hnbap/Update-cause.h>
+
+#if (ASN1C_ENVIRONMENT_VERSION < 924)
+# error "You are compiling with the wrong version of ASN1C"
+#endif
+
+#include <osmocom/core/logging.h>
+
+#define HNBAP_DEBUG(x, args ...) DEBUGP(1, x, ## args)
+
+extern int asn1_xer_print;
+
+struct msgb *hnbap_generate_initiating_message(
+					 e_ProcedureCode procedureCode,
+					 Criticality_t criticality,
+					 asn_TYPE_descriptor_t * td, void *sptr);
+
+struct msgb *hnbap_generate_successful_outcome(
+					   e_ProcedureCode procedureCode,
+					   Criticality_t criticality,
+					   asn_TYPE_descriptor_t * td,
+					   void *sptr);
+
+struct msgb *hnbap_generate_unsuccessful_outcome(
+					   e_ProcedureCode procedureCode,
+					   Criticality_t criticality,
+					   asn_TYPE_descriptor_t * td,
+					   void *sptr);
+
+IE_t *hnbap_new_ie(ProtocolIE_ID_t id, Criticality_t criticality,
+		  asn_TYPE_descriptor_t *type, void *sptr);
+
+char *hnbap_cause_str(Cause_t *cause);
diff --git a/include/osmocom/ranap/Makefile.am b/include/osmocom/ranap/Makefile.am
index 13f1e1c..4728ac8 100644
--- a/include/osmocom/ranap/Makefile.am
+++ b/include/osmocom/ranap/Makefile.am
@@ -3,8 +3,8 @@
 # the build process wants this header file, it should first build
 # src/ranap_encoder.c and src/ranap_decoder.c.
 # This rule sucks:
-ranap_ies_defs.h: $(top_builddir)/src/ranap_encoder.c
-	make -C $(top_builddir)/src/ ranap_encoder.c
+ranap_ies_defs.h:
+	$(MAKE) -C $(top_builddir)/src/ gen_ranap.stamp
 
 ranap_HEADERS = \
 	ranap_ies_defs.h \
diff --git a/include/osmocom/rua/Makefile.am b/include/osmocom/rua/Makefile.am
index 059dfb8..8e8896d 100644
--- a/include/osmocom/rua/Makefile.am
+++ b/include/osmocom/rua/Makefile.am
@@ -1,4 +1,5 @@
 noinst_HEADERS = \
+	rua_common.h rua_ies_defs.h \
 	RUA_Ansi-41-IDNNS.h \
 	RUA_Cause.h \
 	RUA_CauseMisc.h \
diff --git a/include/osmocom/rua/rua_common.h b/include/osmocom/rua/rua_common.h
new file mode 100644
index 0000000..9b3a65c
--- /dev/null
+++ b/include/osmocom/rua/rua_common.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <asn_application.h>
+
+#include <osmocom/rua/RUA_Ansi-41-IDNNS.h>
+#include <osmocom/rua/RUA_CN-DomainIndicator.h>
+#include <osmocom/rua/RUA_CSGMembershipStatus.h>
+#include <osmocom/rua/RUA_Cause.h>
+#include <osmocom/rua/RUA_CauseMisc.h>
+#include <osmocom/rua/RUA_CauseProtocol.h>
+#include <osmocom/rua/RUA_CauseRadioNetwork.h>
+#include <osmocom/rua/RUA_CauseTransport.h>
+#include <osmocom/rua/RUA_Connect.h>
+#include <osmocom/rua/RUA_ConnectionlessTransfer.h>
+#include <osmocom/rua/RUA_Context-ID.h>
+#include <osmocom/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/rua/RUA_CriticalityDiagnostics.h>
+#include <osmocom/rua/RUA_DirectTransfer.h>
+#include <osmocom/rua/RUA_Disconnect.h>
+#include <osmocom/rua/RUA_ErrorIndication.h>
+#include <osmocom/rua/RUA_Establishment-Cause.h>
+#include <osmocom/rua/RUA_Gsm-map-IDNNS.h>
+#include <osmocom/rua/RUA_IE-Extensions.h>
+#include <osmocom/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_InitiatingMessage.h>
+#include <osmocom/rua/RUA_IntraDomainNasNodeSelector.h>
+#include <osmocom/rua/RUA_Presence.h>
+#include <osmocom/rua/RUA_PrivateIE-ID.h>
+#include <osmocom/rua/RUA_PrivateMessage.h>
+#include <osmocom/rua/RUA_ProcedureCode.h>
+#include <osmocom/rua/RUA_ProtocolIE-ID.h>
+#include <osmocom/rua/RUA_RANAP-Message.h>
+#include <osmocom/rua/RUA_RUA-PDU.h>
+#include <osmocom/rua/RUA_RoutingParameter.h>
+#include <osmocom/rua/RUA_SuccessfulOutcome.h>
+#include <osmocom/rua/RUA_TriggeringMessage.h>
+#include <osmocom/rua/RUA_TypeOfError.h>
+#include <osmocom/rua/RUA_UnsuccessfulOutcome.h>
+
+#if (ASN1C_ENVIRONMENT_VERSION < 924)
+# error "You are compiling with the wrong version of ASN1C"
+#endif
+
+#include <osmocom/core/logging.h>
+
+#define RUA_DEBUG(x, args ...) DEBUGP(0, x, ## args)
+
+extern int asn1_xer_print;
+
+struct msgb *rua_generate_initiating_message(
+					e_RUA_ProcedureCode procedureCode,
+					RUA_Criticality_t criticality,
+					asn_TYPE_descriptor_t * td, void *sptr);
+
+struct msgb *rua_generate_successful_outcome(
+					   e_RUA_ProcedureCode procedureCode,
+					   RUA_Criticality_t criticality,
+					   asn_TYPE_descriptor_t * td,
+					   void *sptr);
+
+struct msgb *rua_generate_unsuccessful_outcome(
+					   e_RUA_ProcedureCode procedureCode,
+					   RUA_Criticality_t criticality,
+					   asn_TYPE_descriptor_t * td,
+					   void *sptr);
+
+RUA_IE_t *rua_new_ie(RUA_ProtocolIE_ID_t id, RUA_Criticality_t criticality,
+		     asn_TYPE_descriptor_t *type, void *sptr);
+
+char *rua_cause_str(RUA_Cause_t *cause);
-- 
cgit v1.2.3