From c951a491a9082b8b5931782f45f82e251eb93c3c Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Wed, 2 Nov 2016 17:21:04 +0100 Subject: [PATCH] Build: fix distribution of asn1/asn1c files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All the headers are now listed in _SOURCES variable. It seems weird but this is what GNU Automake manual suggests in section 9.2 Header files: Headers used by programs or convenience libraries are not installed. The noinst_HEADERS variable can be used for such headers. However when the header actually belongs to a single convenience library or program, we recommend listing it in the program’s or library’s _SOURCES variable (see Program Sources) instead of in noinst_HEADERS. This is clearer for the Makefile.am reader. noinst_HEADERS would be the right variable to use in a directory containing only headers and no associated library or program. https://fedorahosted.org/freeipa/ticket/6418 Reviewed-By: Martin Basti Reviewed-By: Christian Heimes --- asn1/asn1c/Makefile.am | 87 ++++++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 25 deletions(-) diff --git a/asn1/asn1c/Makefile.am b/asn1/asn1c/Makefile.am index fa35562f1..3829c5ebc 100644 --- a/asn1/asn1c/Makefile.am +++ b/asn1/asn1c/Makefile.am @@ -1,37 +1,74 @@ libasn1c_la_SOURCES = \ - INTEGER.c \ - NativeEnumerated.c \ - NativeInteger.c \ - asn_SEQUENCE_OF.c \ - asn_SET_OF.c \ - constr_CHOICE.c \ - constr_SEQUENCE.c \ - constr_SEQUENCE_OF.c \ - constr_SET_OF.c \ - OCTET_STRING.c \ - BIT_STRING.c \ + asn_application.h \ + asn_codecs.h \ asn_codecs_prim.c \ - ber_tlv_length.c \ - ber_tlv_tag.c \ + asn_codecs_prim.h \ + asn_internal.h \ + asn_SEQUENCE_OF.c \ + asn_SEQUENCE_OF.h \ + asn_SET_OF.c \ + asn_SET_OF.h \ + asn_system.h \ ber_decoder.c \ - der_encoder.c \ - constr_TYPE.c \ + ber_decoder.h \ + ber_tlv_length.c \ + ber_tlv_length.h \ + ber_tlv_tag.c \ + ber_tlv_tag.h \ + BIT_STRING.c \ + BIT_STRING.h \ constraints.c \ - xer_support.c \ - xer_decoder.c \ - xer_encoder.c \ - per_support.c \ - per_decoder.c \ - per_encoder.c \ - per_opentype.c \ - Int32.c \ + constraints.h \ + constr_CHOICE.c \ + constr_CHOICE.h \ + constr_SEQUENCE.c \ + constr_SEQUENCE.h \ + constr_SEQUENCE_OF.c \ + constr_SEQUENCE_OF.h \ + constr_SET_OF.c \ + constr_SET_OF.h \ + constr_TYPE.c \ + constr_TYPE.h \ + der_encoder.c \ + der_encoder.h \ GetKeytabControl.c \ - GKNewKeys.c \ + GetKeytabControl.h \ GKCurrentKeys.c \ + GKCurrentKeys.h \ + GKNewKeys.c \ + GKNewKeys.h \ GKReply.c \ + GKReply.h \ + Int32.c \ + Int32.h \ + INTEGER.c \ + INTEGER.h \ KrbKey.c \ - TypeValuePair.c + KrbKey.h \ + NativeEnumerated.c \ + NativeEnumerated.h \ + NativeInteger.c \ + NativeInteger.h \ + OCTET_STRING.c \ + OCTET_STRING.h \ + per_decoder.c \ + per_decoder.h \ + per_encoder.c \ + per_encoder.h \ + per_opentype.c \ + per_opentype.h \ + per_support.c \ + per_support.h \ + TypeValuePair.c \ + TypeValuePair.h \ + xer_decoder.c \ + xer_decoder.h \ + xer_encoder.c \ + xer_encoder.h \ + xer_support.c \ + xer_support.h +EXTRA_DIST = ipa.asn1 AM_CPPFLAGS = -I$(top_srcdir)/util