simplify dependencies

5 files changed, 8 insertions, 46 deletions

diff --git a/skeletons/INTEGER.h b/skeletons/INTEGER.h
index 86b603bb..43333de7 100644
--- a/skeletons/INTEGER.h
+++ b/skeletons/INTEGER.h
@@ -7,7 +7,6 @@
 
 #include <asn_application.h>
 #include <asn_codecs_prim.h>
-#include <INTEGER_oer.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,6 +39,8 @@ ber_type_decoder_f INTEGER_decode_ber;
 der_type_encoder_f INTEGER_encode_der;
 xer_type_decoder_f INTEGER_decode_xer;
 xer_type_encoder_f INTEGER_encode_xer;
+oer_type_decoder_f INTEGER_decode_oer;
+oer_type_encoder_f INTEGER_encode_oer;
 per_type_decoder_f INTEGER_decode_uper;
 per_type_encoder_f INTEGER_encode_uper;
 
diff --git a/skeletons/INTEGER_oer.h b/skeletons/INTEGER_oer.h
deleted file mode 100644
index 6733bfa0..00000000
--- a/skeletons/INTEGER_oer.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*-
- * Copyright (c) 2017 Lev Walkin <vlm@lionet.info>. All rights reserved.
- * Redistribution and modifications are permitted subject to BSD license.
- */
-#ifndef	_INTEGER_OER_H_
-#define	_INTEGER_OER_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <asn_application.h>
-#include <asn_codecs.h>
-
-oer_type_decoder_f INTEGER_decode_oer;
-oer_type_encoder_f INTEGER_encode_oer;
-
-#ifdef __cplusplus
-}
-#endif
-#endif	/* _INTEGER_OER_H_ */
diff --git a/skeletons/constr_SEQUENCE.h b/skeletons/constr_SEQUENCE.h
index f20381ad..fb96734c 100644
--- a/skeletons/constr_SEQUENCE.h
+++ b/skeletons/constr_SEQUENCE.h
@@ -6,7 +6,6 @@
 #define	_CONSTR_SEQUENCE_H_
 
 #include <asn_application.h>
-#include <constr_SEQUENCE_oer.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,6 +50,8 @@ ber_type_decoder_f SEQUENCE_decode_ber;
 der_type_encoder_f SEQUENCE_encode_der;
 xer_type_decoder_f SEQUENCE_decode_xer;
 xer_type_encoder_f SEQUENCE_encode_xer;
+oer_type_decoder_f SEQUENCE_decode_oer;
+oer_type_encoder_f SEQUENCE_encode_oer;
 per_type_decoder_f SEQUENCE_decode_uper;
 per_type_encoder_f SEQUENCE_encode_uper;
 
diff --git a/skeletons/constr_SEQUENCE_oer.h b/skeletons/constr_SEQUENCE_oer.h
deleted file mode 100644
index dce71be9..00000000
--- a/skeletons/constr_SEQUENCE_oer.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*-
- * Copyright (c) 2017 Lev Walkin <vlm@lionet.info>. All rights reserved.
- * Redistribution and modifications are permitted subject to BSD license.
- */
-#ifndef	CONSTR_SEQUENCE_OER_H
-#define	CONSTR_SEQUENCE_OER_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <asn_application.h>
-#include <asn_codecs.h>
-
-oer_type_decoder_f SEQUENCE_decode_oer;
-oer_type_encoder_f SEQUENCE_encode_oer;
-
-#ifdef __cplusplus
-}
-#endif
-#endif	/* CONSTR_SEQUENCE_OER_H */
diff --git a/skeletons/file-dependencies b/skeletons/file-dependencies
index acd86c33..76abdb57 100644
--- a/skeletons/file-dependencies
+++ b/skeletons/file-dependencies
@@ -3,8 +3,6 @@
 # The format is like this:
 # 	<filename> <dependent-file> ...
 #
-# $Id$
-#
 
 ANY.h ANY.c
 BMPString.h BMPString.c UTF8String.h
@@ -37,7 +35,7 @@ asn_SEQUENCE_OF.h asn_SEQUENCE_OF.c asn_SET_OF.h
 asn_SET_OF.h asn_SET_OF.c
 constr_CHOICE.h constr_CHOICE.c
 constr_SEQUENCE.h constr_SEQUENCE.c
-constr_SEQUENCE_OF.h constr_SEQUENCE_OF.c constr_SEQUENCE_oer.h asn_SEQUENCE_OF.h constr_SET_OF.h
+constr_SEQUENCE_OF.h constr_SEQUENCE_OF.c asn_SEQUENCE_OF.h constr_SET_OF.h
 constr_SET.h constr_SET.c
 constr_SET_OF.h constr_SET_OF.c asn_SET_OF.h
 
@@ -70,6 +68,8 @@ CONVERTER:			# THIS IS A SPECIAL SECTION
 converter-sample.c		# A default name for sample transcoder
 
 CODEC-OER:			# THIS IS A SPECIAL SECTION
-constr_SEQUENCE_oer.h constr_SEQUENCE_oer.c
+INTEGER_oer.c
+NativeInteger_oer.c
+constr_SEQUENCE_oer.c
 
 CODEC-PER:			# THIS IS A SPECIAL SECTION