From 3a41b3bb8860cf73fef7efd54db2da5ecbd608d5 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspacek@redhat.com>
Date: Nov 09 2016 12:08:32 +0000
Subject: 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>

---

diff --git a/asn1/asn1c/Makefile.am b/asn1/asn1c/Makefile.am
index 87a486d..b4dee67 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