Makefile restructuring; install ranap header files
diff --git a/src/Makefile.am b/src/Makefile.am
index 29e8c56..93b6fba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,8 @@
SUBDIRS = hnbap rua ranap tests
-RANAP_LIBVERSION=0:0:0
-
+# Build {hnbap,rua,ranap}_{encoder,decoder}.c using asn1tostruct
ASN1_ROOT = $(top_builddir)/asn1/
ASN1TOSTRUCT = $(ASN1_ROOT)/utils/asn1tostruct.py
-
-AM_CFLAGS = $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -Ihnbap/
-COMMON_LDADD = -lsctp
-
-lib_LTLIBRARIES = libosmo-ranap.la
-libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION)
-libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(ASN1C_LIBS) $(COMMON_LDADD) ranap/libosmo-asn1-ranap.la
-libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_msg_factory.c
-
-bin_PROGRAMS = hnbgw
-
-hnbgw_SOURCES = hnbap_encoder.c hnbap_decoder.c rua_encoder.c rua_decoder.c rua_common.c hnbap_common.c iu_helpers.c asn1helpers.c hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c context_map.c hnbgw_cn.c sccp_helpers.c
-hnbgw_LDADD = $(OSMOCORE_LIBS) $(OSMOVTY_LIBS) $(OSMOGSM_LIBS) $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) $(COMMON_LDADD) hnbap/libosmo-asn1-hnbap.a rua/libosmo-asn1-rua.a libosmo-ranap.la
-
BUILT_SOURCES = hnbap_decoder.c hnbap_encoder.c rua_decoder.c rua_encoder.c ranap_decoder.c ranap_encoder.c
hnbap_encoder.c hnbap_decoder.c hnbap_ies_defs.h: $(ASN1_ROOT)/hnbap/HNBAP-PDU-Contents.asn
@@ -28,3 +13,39 @@
ranap_encoder.c ranap_decoder.c ranap_ies_defs.h: $(ASN1_ROOT)/ranap/RANAP-PDU-Contents.asn
$(ASN1TOSTRUCT) -p RANAP_ -f $<
+
+
+AM_CFLAGS = $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -Ihnbap/
+COMMON_LDADD = -lsctp
+
+# build the shared RANAP library
+#
+RANAP_LIBVERSION=0:0:0
+lib_LTLIBRARIES = libosmo-ranap.la
+libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION)
+libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(ASN1C_LIBS) $(COMMON_LDADD) ranap/libosmo-asn1-ranap.la
+libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_msg_factory.c
+
+osmoranap_HEADERS = ranap_common.h ranap_ies_defs.h ranap_msg_factory.h
+osmoranapdir = $(includedir)/osmocom/ranap
+
+
+# build the actual HomeNodeB gateway
+#
+bin_PROGRAMS = osmo-hnbgw
+
+noinst_HEADERS = hnbap_common.h hnbap_ies_defs.h \
+ rua_common.h rua_ies_defs.h \
+ context_map.h hnbgw.h hnbgw_cn.h \
+ hnbgw_hnbap.h hnbgw_rua.h hnbgw_ranap.h
+
+osmo_hnbgw_SOURCES = hnbap_encoder.c hnbap_decoder.c hnbap_common.c \
+ rua_encoder.c rua_decoder.c rua_common.c \
+ iu_helpers.c asn1helpers.c sccp_helpers.c \
+ hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \
+ context_map.c hnbgw_cn.c
+
+osmo_hnbgw_LDADD = $(OSMOCORE_LIBS) $(OSMOVTY_LIBS) $(OSMOGSM_LIBS) \
+ $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) $(COMMON_LDADD) \
+ hnbap/libosmo-asn1-hnbap.a rua/libosmo-asn1-rua.a \
+ libosmo-ranap.la
diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am
index 16bd69f..567da87 100644
--- a/src/ranap/Makefile.am
+++ b/src/ranap/Makefile.am
@@ -1164,7 +1164,8 @@
noinst_LTLIBRARIES=libosmo-asn1-ranap.la
libosmo_asn1_ranap_la_SOURCES=$(ASN_MODULE_SRC)
-include_HEADERS=$(ASN_MODULE_INC)
+osmoranap_HEADERS=$(ASN_MODULE_INC)
+osmoranapdir = $(includedir)/osmocom/ranap
libosmo_asn1_ranap_la_LIBADD=$(ASN1C_LDADD)
regen: regenerate-from-asn1-source