diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-10-25 17:21:22 +0200 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-09 13:08:32 +0100 |
| commit | 3a41b3bb8860cf73fef7efd54db2da5ecbd608d5 (patch) | |
| tree | 4fad3145cabc88bf446c3d399aefd42333f4c4ec /asn1 | |
| parent | 3d6b8f8bdd5568c44d293cba960209941e4d2545 (diff) | |
| download | freeipa-3a41b3bb8860cf73fef7efd54db2da5ecbd608d5.tar.gz freeipa-3a41b3bb8860cf73fef7efd54db2da5ecbd608d5.tar.xz freeipa-3a41b3bb8860cf73fef7efd54db2da5ecbd608d5.zip | |
Build: fix make install in asn1 subdirectory
Most of the logic was unnecessary and wrong. This caused make install to fail.
This commit removes unnecessary declarations and creates static library
which is not installed. make install in asn1 subdirectory is now passing
(and doing nothing).
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/asn1c/Makefile.am | 57 |
1 files changed, 2 insertions, 55 deletions
diff --git a/asn1/asn1c/Makefile.am b/asn1/asn1c/Makefile.am index 87a486d18..b4dee675a 100644 --- a/asn1/asn1c/Makefile.am +++ b/asn1/asn1c/Makefile.am @@ -1,6 +1,4 @@ -NULL = - -ASN1C_SOURCES = \ +libasn1c_la_SOURCES = \ INTEGER.c \ NativeEnumerated.c \ NativeInteger.c \ @@ -26,69 +24,18 @@ ASN1C_SOURCES = \ per_decoder.c \ per_encoder.c \ per_opentype.c \ - $(NULL) - -ASN1C_HEADERS = - INTEGER.h \ - NativeEnumerated.h \ - NativeInteger.h \ - asn_SEQUENCE_OF.h \ - asn_SET_OF.h \ - constr_CHOICE.h \ - constr_SEQUENCE.h \ - constr_SEQUENCE_OF.h \ - constr_SET_OF.h \ - asn_application.h \ - asn_system.h \ - asn_codecs.h \ - asn_internal.h \ - OCTET_STRING.h \ - BIT_STRING.h \ - asn_codecs_prim.h \ - ber_tlv_length.h \ - ber_tlv_tag.h \ - ber_decoder.h \ - der_encoder.h \ - constr_TYPE.h \ - constraints.h \ - xer_support.h \ - xer_decoder.h \ - xer_encoder.h \ - per_support.h \ - per_decoder.h \ - per_encoder.h \ - per_opentype.h \ - $(NULL) - -ASN1Cdir = . - -IPAASN1_SOURCES= \ Int32.c \ GetKeytabControl.c \ GKNewKeys.c \ GKCurrentKeys.c \ GKReply.c \ KrbKey.c \ - TypeValuePair.c \ - $(NULL) - -IPAASN1_HEADERS= \ - Int32.h \ - GetKeytabControl.h \ - GKNewKeys.h \ - GKCurrentKeys.h \ - GKReply.h \ - KrbKey.h \ - TypeValuePair.h \ - $(NULL) + TypeValuePair.c -IPAASN1dir = . AM_CPPFLAGS = -I../../util noinst_LTLIBRARIES=libasn1c.la -noinst_HEADERS=$(ASN1C_HEADERS) $(IPAASN1_HEADERS) -libasn1c_la_SOURCES=$(ASN1C_SOURCES) $(IPAASN1_SOURCES) regenerate: asn1c -fskeletons-copy -fnative-types ipa.asn1 |