Rename ASN_MODULE_{SOURCES,HEADERS} => ASN_MODULE_{SRCS,HDRS}
diff --git a/examples/sample.makefile.regen b/examples/sample.makefile.regen
index 16e100b..c65c472 100755
--- a/examples/sample.makefile.regen
+++ b/examples/sample.makefile.regen
@@ -144,9 +144,9 @@
echo " @if [ -f WIP ]; then cat WIP; sleep 2; fi"
echo
echo "distclean: clean"
- echo ' rm -f $(ASN_MODULE_SOURCES)'
- echo ' rm -f $(ASN_MODULE_HEADERS)'
- echo ' rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)'
+ echo ' rm -f $(ASN_MODULE_SRCS)'
+ echo ' rm -f $(ASN_MODULE_HDRS)'
+ echo ' rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)'
echo " rm -f Makefile.am.example"
} > Makefile
diff --git a/examples/sample.source.1609.2/Makefile b/examples/sample.source.1609.2/Makefile
index 14715be..7acfdb2 100644
--- a/examples/sample.source.1609.2/Makefile
+++ b/examples/sample.source.1609.2/Makefile
@@ -101,7 +101,7 @@
@if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
- rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
+ rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
diff --git a/examples/sample.source.J2735/Makefile b/examples/sample.source.J2735/Makefile
index 79570fe..c99dc36 100644
--- a/examples/sample.source.J2735/Makefile
+++ b/examples/sample.source.J2735/Makefile
@@ -101,7 +101,7 @@
@if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
- rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
+ rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
diff --git a/examples/sample.source.LDAP3/Makefile b/examples/sample.source.LDAP3/Makefile
index e2909fd..8fc422e 100644
--- a/examples/sample.source.LDAP3/Makefile
+++ b/examples/sample.source.LDAP3/Makefile
@@ -101,7 +101,7 @@
@if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
- rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
+ rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
diff --git a/examples/sample.source.LTE-RRC/Makefile b/examples/sample.source.LTE-RRC/Makefile
index 1c4b2bb..7cd21d0 100644
--- a/examples/sample.source.LTE-RRC/Makefile
+++ b/examples/sample.source.LTE-RRC/Makefile
@@ -1,4 +1,4 @@
-ASN_MODULE_SOURCES= \
+ASN_MODULE_SRCS= \
BCCH-BCH-Message.c \
BCCH-BCH-MessageType.c \
BCCH-BCH-Message-MBMS.c \
@@ -1754,7 +1754,7 @@
ReestablishmentInfo-NB.c \
RRM-Config-NB.c
-ASN_MODULE_HEADERS= \
+ASN_MODULE_HDRS= \
BCCH-BCH-Message.h \
BCCH-BCH-MessageType.h \
BCCH-BCH-Message-MBMS.h \
@@ -3510,76 +3510,76 @@
ReestablishmentInfo-NB.h \
RRM-Config-NB.h
-ASN_MODULE_HEADERS+=BOOLEAN.h
-ASN_MODULE_SOURCES+=BOOLEAN.c
-ASN_MODULE_HEADERS+=INTEGER.h
-ASN_MODULE_HEADERS+=NativeEnumerated.h
-ASN_MODULE_SOURCES+=INTEGER.c
-ASN_MODULE_HEADERS+=NULL.h
-ASN_MODULE_SOURCES+=NULL.c
-ASN_MODULE_SOURCES+=NativeEnumerated.c
-ASN_MODULE_HEADERS+=NativeInteger.h
-ASN_MODULE_SOURCES+=NativeInteger.c
-ASN_MODULE_HEADERS+=asn_SEQUENCE_OF.h
-ASN_MODULE_SOURCES+=asn_SEQUENCE_OF.c
-ASN_MODULE_HEADERS+=asn_SET_OF.h
-ASN_MODULE_SOURCES+=asn_SET_OF.c
-ASN_MODULE_HEADERS+=constr_CHOICE.h
-ASN_MODULE_SOURCES+=constr_CHOICE.c
-ASN_MODULE_HEADERS+=constr_SEQUENCE.h
-ASN_MODULE_SOURCES+=constr_SEQUENCE.c
-ASN_MODULE_HEADERS+=constr_SEQUENCE_OF.h
-ASN_MODULE_SOURCES+=constr_SEQUENCE_OF.c
-ASN_MODULE_HEADERS+=constr_SET_OF.h
-ASN_MODULE_SOURCES+=constr_SET_OF.c
-ASN_MODULE_HEADERS+=asn_application.h
-ASN_MODULE_HEADERS+=asn_system.h
-ASN_MODULE_HEADERS+=asn_codecs.h
-ASN_MODULE_HEADERS+=asn_internal.h
-ASN_MODULE_HEADERS+=OCTET_STRING.h
-ASN_MODULE_SOURCES+=OCTET_STRING.c
-ASN_MODULE_HEADERS+=BIT_STRING.h
-ASN_MODULE_SOURCES+=BIT_STRING.c
-ASN_MODULE_SOURCES+=asn_codecs_prim.c
-ASN_MODULE_HEADERS+=asn_codecs_prim.h
-ASN_MODULE_HEADERS+=ber_tlv_length.h
-ASN_MODULE_SOURCES+=ber_tlv_length.c
-ASN_MODULE_HEADERS+=ber_tlv_tag.h
-ASN_MODULE_SOURCES+=ber_tlv_tag.c
-ASN_MODULE_HEADERS+=ber_decoder.h
-ASN_MODULE_SOURCES+=ber_decoder.c
-ASN_MODULE_HEADERS+=der_encoder.h
-ASN_MODULE_SOURCES+=der_encoder.c
-ASN_MODULE_HEADERS+=constr_TYPE.h
-ASN_MODULE_SOURCES+=constr_TYPE.c
-ASN_MODULE_HEADERS+=constraints.h
-ASN_MODULE_SOURCES+=constraints.c
-ASN_MODULE_HEADERS+=xer_support.h
-ASN_MODULE_SOURCES+=xer_support.c
-ASN_MODULE_HEADERS+=xer_decoder.h
-ASN_MODULE_SOURCES+=xer_decoder.c
-ASN_MODULE_HEADERS+=xer_encoder.h
-ASN_MODULE_SOURCES+=xer_encoder.c
-ASN_MODULE_HEADERS+=per_support.h
-ASN_MODULE_SOURCES+=per_support.c
-ASN_MODULE_HEADERS+=per_decoder.h
-ASN_MODULE_SOURCES+=per_decoder.c
-ASN_MODULE_HEADERS+=per_encoder.h
-ASN_MODULE_SOURCES+=per_encoder.c
-ASN_MODULE_HEADERS+=per_opentype.h
-ASN_MODULE_SOURCES+=per_opentype.c
+ASN_MODULE_HDRS+=BOOLEAN.h
+ASN_MODULE_SRCS+=BOOLEAN.c
+ASN_MODULE_HDRS+=INTEGER.h
+ASN_MODULE_HDRS+=NativeEnumerated.h
+ASN_MODULE_SRCS+=INTEGER.c
+ASN_MODULE_HDRS+=NULL.h
+ASN_MODULE_SRCS+=NULL.c
+ASN_MODULE_SRCS+=NativeEnumerated.c
+ASN_MODULE_HDRS+=NativeInteger.h
+ASN_MODULE_SRCS+=NativeInteger.c
+ASN_MODULE_HDRS+=asn_SEQUENCE_OF.h
+ASN_MODULE_SRCS+=asn_SEQUENCE_OF.c
+ASN_MODULE_HDRS+=asn_SET_OF.h
+ASN_MODULE_SRCS+=asn_SET_OF.c
+ASN_MODULE_HDRS+=constr_CHOICE.h
+ASN_MODULE_SRCS+=constr_CHOICE.c
+ASN_MODULE_HDRS+=constr_SEQUENCE.h
+ASN_MODULE_SRCS+=constr_SEQUENCE.c
+ASN_MODULE_HDRS+=constr_SEQUENCE_OF.h
+ASN_MODULE_SRCS+=constr_SEQUENCE_OF.c
+ASN_MODULE_HDRS+=constr_SET_OF.h
+ASN_MODULE_SRCS+=constr_SET_OF.c
+ASN_MODULE_HDRS+=asn_application.h
+ASN_MODULE_HDRS+=asn_system.h
+ASN_MODULE_HDRS+=asn_codecs.h
+ASN_MODULE_HDRS+=asn_internal.h
+ASN_MODULE_HDRS+=OCTET_STRING.h
+ASN_MODULE_SRCS+=OCTET_STRING.c
+ASN_MODULE_HDRS+=BIT_STRING.h
+ASN_MODULE_SRCS+=BIT_STRING.c
+ASN_MODULE_SRCS+=asn_codecs_prim.c
+ASN_MODULE_HDRS+=asn_codecs_prim.h
+ASN_MODULE_HDRS+=ber_tlv_length.h
+ASN_MODULE_SRCS+=ber_tlv_length.c
+ASN_MODULE_HDRS+=ber_tlv_tag.h
+ASN_MODULE_SRCS+=ber_tlv_tag.c
+ASN_MODULE_HDRS+=ber_decoder.h
+ASN_MODULE_SRCS+=ber_decoder.c
+ASN_MODULE_HDRS+=der_encoder.h
+ASN_MODULE_SRCS+=der_encoder.c
+ASN_MODULE_HDRS+=constr_TYPE.h
+ASN_MODULE_SRCS+=constr_TYPE.c
+ASN_MODULE_HDRS+=constraints.h
+ASN_MODULE_SRCS+=constraints.c
+ASN_MODULE_HDRS+=xer_support.h
+ASN_MODULE_SRCS+=xer_support.c
+ASN_MODULE_HDRS+=xer_decoder.h
+ASN_MODULE_SRCS+=xer_decoder.c
+ASN_MODULE_HDRS+=xer_encoder.h
+ASN_MODULE_SRCS+=xer_encoder.c
+ASN_MODULE_HDRS+=per_support.h
+ASN_MODULE_SRCS+=per_support.c
+ASN_MODULE_HDRS+=per_decoder.h
+ASN_MODULE_SRCS+=per_decoder.c
+ASN_MODULE_HDRS+=per_encoder.h
+ASN_MODULE_SRCS+=per_encoder.c
+ASN_MODULE_HDRS+=per_opentype.h
+ASN_MODULE_SRCS+=per_opentype.c
ASN_CONVERTER_SOURCES+=converter-sample.c
ASN_CONVERTER_SOURCES+=pdu_collection.c
lib_LTLIBRARIES=libsomething.la
-libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
+libsomething_la_SOURCES=$(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS)
# This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file
TARGET = lte-rrc-dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=DL_DCCH_Message -DASN_PDU_COLLECTION -I.
-OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
+OBJS=${ASN_MODULE_SRCS:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: DL-DCCH-Message.c $(TARGET)
@@ -3678,7 +3678,7 @@
done; done; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_CONVERTER_SOURCES) $(ASN_CONVERTER_HEADERS)
rm -f Makefile.am.sample
diff --git a/examples/sample.source.MEGACO/Makefile b/examples/sample.source.MEGACO/Makefile
index 0f5b792..5967995 100644
--- a/examples/sample.source.MEGACO/Makefile
+++ b/examples/sample.source.MEGACO/Makefile
@@ -100,7 +100,7 @@
@if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
- rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
+ rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
diff --git a/examples/sample.source.MHEG5/Makefile b/examples/sample.source.MHEG5/Makefile
index 432aebe..6229c1d 100644
--- a/examples/sample.source.MHEG5/Makefile
+++ b/examples/sample.source.MHEG5/Makefile
@@ -1,4 +1,4 @@
-ASN_MODULE_SOURCES= \
+ASN_MODULE_SRCS= \
InterchangedObject.c \
RootClass.c \
GroupClass.c \
@@ -188,7 +188,7 @@
Colour.c \
XYPosition.c
-ASN_MODULE_HEADERS= \
+ASN_MODULE_HDRS= \
InterchangedObject.h \
RootClass.h \
GroupClass.h \
@@ -378,77 +378,77 @@
Colour.h \
XYPosition.h
-ASN_MODULE_HEADERS+=BOOLEAN.h
-ASN_MODULE_SOURCES+=BOOLEAN.c
-ASN_MODULE_HEADERS+=INTEGER.h
-ASN_MODULE_HEADERS+=NativeEnumerated.h
-ASN_MODULE_SOURCES+=INTEGER.c
-ASN_MODULE_HEADERS+=NULL.h
-ASN_MODULE_SOURCES+=NULL.c
-ASN_MODULE_SOURCES+=NativeEnumerated.c
-ASN_MODULE_HEADERS+=NativeInteger.h
-ASN_MODULE_SOURCES+=NativeInteger.c
-ASN_MODULE_HEADERS+=asn_SEQUENCE_OF.h
-ASN_MODULE_SOURCES+=asn_SEQUENCE_OF.c
-ASN_MODULE_HEADERS+=asn_SET_OF.h
-ASN_MODULE_SOURCES+=asn_SET_OF.c
-ASN_MODULE_HEADERS+=constr_CHOICE.h
-ASN_MODULE_SOURCES+=constr_CHOICE.c
-ASN_MODULE_HEADERS+=constr_SEQUENCE.h
-ASN_MODULE_SOURCES+=constr_SEQUENCE.c
-ASN_MODULE_HEADERS+=constr_SEQUENCE_OF.h
-ASN_MODULE_SOURCES+=constr_SEQUENCE_OF.c
-ASN_MODULE_HEADERS+=constr_SET_OF.h
-ASN_MODULE_HEADERS+=constr_SET.h
-ASN_MODULE_SOURCES+=constr_SET.c
-ASN_MODULE_SOURCES+=constr_SET_OF.c
-ASN_MODULE_HEADERS+=asn_application.h
-ASN_MODULE_HEADERS+=asn_system.h
-ASN_MODULE_HEADERS+=asn_codecs.h
-ASN_MODULE_HEADERS+=asn_internal.h
-ASN_MODULE_HEADERS+=OCTET_STRING.h
-ASN_MODULE_SOURCES+=OCTET_STRING.c
-ASN_MODULE_HEADERS+=BIT_STRING.h
-ASN_MODULE_SOURCES+=BIT_STRING.c
-ASN_MODULE_SOURCES+=asn_codecs_prim.c
-ASN_MODULE_HEADERS+=asn_codecs_prim.h
-ASN_MODULE_HEADERS+=ber_tlv_length.h
-ASN_MODULE_SOURCES+=ber_tlv_length.c
-ASN_MODULE_HEADERS+=ber_tlv_tag.h
-ASN_MODULE_SOURCES+=ber_tlv_tag.c
-ASN_MODULE_HEADERS+=ber_decoder.h
-ASN_MODULE_SOURCES+=ber_decoder.c
-ASN_MODULE_HEADERS+=der_encoder.h
-ASN_MODULE_SOURCES+=der_encoder.c
-ASN_MODULE_HEADERS+=constr_TYPE.h
-ASN_MODULE_SOURCES+=constr_TYPE.c
-ASN_MODULE_HEADERS+=constraints.h
-ASN_MODULE_SOURCES+=constraints.c
-ASN_MODULE_HEADERS+=xer_support.h
-ASN_MODULE_SOURCES+=xer_support.c
-ASN_MODULE_HEADERS+=xer_decoder.h
-ASN_MODULE_SOURCES+=xer_decoder.c
-ASN_MODULE_HEADERS+=xer_encoder.h
-ASN_MODULE_SOURCES+=xer_encoder.c
-ASN_MODULE_HEADERS+=per_support.h
-ASN_MODULE_SOURCES+=per_support.c
-ASN_MODULE_HEADERS+=per_decoder.h
-ASN_MODULE_SOURCES+=per_decoder.c
-ASN_MODULE_HEADERS+=per_encoder.h
-ASN_MODULE_SOURCES+=per_encoder.c
-ASN_MODULE_HEADERS+=per_opentype.h
-ASN_MODULE_SOURCES+=per_opentype.c
+ASN_MODULE_HDRS+=BOOLEAN.h
+ASN_MODULE_SRCS+=BOOLEAN.c
+ASN_MODULE_HDRS+=INTEGER.h
+ASN_MODULE_HDRS+=NativeEnumerated.h
+ASN_MODULE_SRCS+=INTEGER.c
+ASN_MODULE_HDRS+=NULL.h
+ASN_MODULE_SRCS+=NULL.c
+ASN_MODULE_SRCS+=NativeEnumerated.c
+ASN_MODULE_HDRS+=NativeInteger.h
+ASN_MODULE_SRCS+=NativeInteger.c
+ASN_MODULE_HDRS+=asn_SEQUENCE_OF.h
+ASN_MODULE_SRCS+=asn_SEQUENCE_OF.c
+ASN_MODULE_HDRS+=asn_SET_OF.h
+ASN_MODULE_SRCS+=asn_SET_OF.c
+ASN_MODULE_HDRS+=constr_CHOICE.h
+ASN_MODULE_SRCS+=constr_CHOICE.c
+ASN_MODULE_HDRS+=constr_SEQUENCE.h
+ASN_MODULE_SRCS+=constr_SEQUENCE.c
+ASN_MODULE_HDRS+=constr_SEQUENCE_OF.h
+ASN_MODULE_SRCS+=constr_SEQUENCE_OF.c
+ASN_MODULE_HDRS+=constr_SET_OF.h
+ASN_MODULE_HDRS+=constr_SET.h
+ASN_MODULE_SRCS+=constr_SET.c
+ASN_MODULE_SRCS+=constr_SET_OF.c
+ASN_MODULE_HDRS+=asn_application.h
+ASN_MODULE_HDRS+=asn_system.h
+ASN_MODULE_HDRS+=asn_codecs.h
+ASN_MODULE_HDRS+=asn_internal.h
+ASN_MODULE_HDRS+=OCTET_STRING.h
+ASN_MODULE_SRCS+=OCTET_STRING.c
+ASN_MODULE_HDRS+=BIT_STRING.h
+ASN_MODULE_SRCS+=BIT_STRING.c
+ASN_MODULE_SRCS+=asn_codecs_prim.c
+ASN_MODULE_HDRS+=asn_codecs_prim.h
+ASN_MODULE_HDRS+=ber_tlv_length.h
+ASN_MODULE_SRCS+=ber_tlv_length.c
+ASN_MODULE_HDRS+=ber_tlv_tag.h
+ASN_MODULE_SRCS+=ber_tlv_tag.c
+ASN_MODULE_HDRS+=ber_decoder.h
+ASN_MODULE_SRCS+=ber_decoder.c
+ASN_MODULE_HDRS+=der_encoder.h
+ASN_MODULE_SRCS+=der_encoder.c
+ASN_MODULE_HDRS+=constr_TYPE.h
+ASN_MODULE_SRCS+=constr_TYPE.c
+ASN_MODULE_HDRS+=constraints.h
+ASN_MODULE_SRCS+=constraints.c
+ASN_MODULE_HDRS+=xer_support.h
+ASN_MODULE_SRCS+=xer_support.c
+ASN_MODULE_HDRS+=xer_decoder.h
+ASN_MODULE_SRCS+=xer_decoder.c
+ASN_MODULE_HDRS+=xer_encoder.h
+ASN_MODULE_SRCS+=xer_encoder.c
+ASN_MODULE_HDRS+=per_support.h
+ASN_MODULE_SRCS+=per_support.c
+ASN_MODULE_HDRS+=per_decoder.h
+ASN_MODULE_SRCS+=per_decoder.c
+ASN_MODULE_HDRS+=per_encoder.h
+ASN_MODULE_SRCS+=per_encoder.c
+ASN_MODULE_HDRS+=per_opentype.h
+ASN_MODULE_SRCS+=per_opentype.c
ASN_CONVERTER_SOURCES+=converter-sample.c
lib_LTLIBRARIES=libsomething.la
-libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)
+libsomething_la_SOURCES=$(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS)
# This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file
TARGET = mheg5dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=InterchangedObject -I.
-OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
+OBJS=${ASN_MODULE_SRCS:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: InterchangedObject.c $(TARGET)
@@ -547,7 +547,7 @@
done; done; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_CONVERTER_SOURCES) $(ASN_CONVERTER_HEADERS)
rm -f Makefile.am.sample
diff --git a/examples/sample.source.PKIX1/Makefile b/examples/sample.source.PKIX1/Makefile
index 10825d0..d0da0a0 100644
--- a/examples/sample.source.PKIX1/Makefile
+++ b/examples/sample.source.PKIX1/Makefile
@@ -100,7 +100,7 @@
@if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
- rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
+ rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
diff --git a/examples/sample.source.RRC/Makefile b/examples/sample.source.RRC/Makefile
index dcf3f1d..11637e4 100644
--- a/examples/sample.source.RRC/Makefile
+++ b/examples/sample.source.RRC/Makefile
@@ -100,7 +100,7 @@
@if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
- rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
+ rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
diff --git a/examples/sample.source.TAP3/Makefile b/examples/sample.source.TAP3/Makefile
index e989ff3..cbd20ac 100644
--- a/examples/sample.source.TAP3/Makefile
+++ b/examples/sample.source.TAP3/Makefile
@@ -101,7 +101,7 @@
@if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
- rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
+ rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
diff --git a/examples/sample.source.ULP/Makefile b/examples/sample.source.ULP/Makefile
index e666e3e..23ee903 100644
--- a/examples/sample.source.ULP/Makefile
+++ b/examples/sample.source.ULP/Makefile
@@ -101,7 +101,7 @@
@if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean
- rm -f $(ASN_MODULE_SOURCES)
- rm -f $(ASN_MODULE_HEADERS)
- rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)
+ rm -f $(ASN_MODULE_SRCS)
+ rm -f $(ASN_MODULE_HDRS)
+ rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example
diff --git a/libasn1compiler/asn1c_save.c b/libasn1compiler/asn1c_save.c
index 2aaee05..bb506c5 100644
--- a/libasn1compiler/asn1c_save.c
+++ b/libasn1compiler/asn1c_save.c
@@ -65,7 +65,7 @@
return -1;
}
- safe_fprintf(mkf, "ASN_MODULE_SOURCES=");
+ safe_fprintf(mkf, "ASN_MODULE_SRCS=");
TQ_FOR(mod, &(arg->asn->modules), mod_next) {
TQ_FOR(arg->expr, &(mod->members), next) {
if(asn1_lang_map[arg->expr->meta_type]
@@ -75,7 +75,7 @@
}
}
}
- safe_fprintf(mkf, "\n\nASN_MODULE_HEADERS=");
+ safe_fprintf(mkf, "\n\nASN_MODULE_HDRS=");
TQ_FOR(mod, &(arg->asn->modules), mod_next) {
TQ_FOR(arg->expr, &(mod->members), next) {
if(asn1_lang_map[arg->expr->meta_type]
@@ -101,37 +101,37 @@
dir_end = dstpath + dlen;
*dir_end++ = '/';
- for(size_t i = 0; i < dlist->deps_count; i++) {
- char where[32]; /* Location of the */
- char *what_kind; /* HEADERS or SOURCES */
- const asn1c_dep_filename *dep_file = dlist->deps[i];
+ for(size_t i = 0; i < dlist->deps_count; i++) {
+ char where[32]; /* Location of the */
+ char *what_kind; /* HDRS or SRCS */
+ const asn1c_dep_filename *dep_file = dlist->deps[i];
char *fname = dep_file->filename;
char *dotH;
assert(strlen(fname) < (sizeof(dstpath) / 2));
strcpy(dir_end, fname);
- if(arg->flags & A1C_DEBUG) {
- snprintf(where, sizeof(where), "(line %d col %d)",
- dep_file->lineno, dep_file->column);
- } else {
- where[0] = '\0';
- }
+ if(arg->flags & A1C_DEBUG) {
+ snprintf(where, sizeof(where), "(line %d col %d)",
+ dep_file->lineno, dep_file->column);
+ } else {
+ where[0] = '\0';
+ }
- if(asn1c_copy_over(arg, dstpath, where) == -1) {
+ if(asn1c_copy_over(arg, dstpath, where) == -1) {
safe_fprintf(mkf, ">>>ABORTED<<<");
fclose(mkf);
return -1;
}
- /* HEADERS versus SOURCES */
- dotH = strrchr(fname, 'h');
- if(dotH && fname < dotH && dotH[-1] == '.' && !dotH[1]) {
- what_kind = "HEADERS";
- } else {
- what_kind = "SOURCES";
- }
- safe_fprintf(mkf, "ASN_MODULE_%s+=%s\n", what_kind, fname);
+ /* HDRS versus SRCS */
+ dotH = strrchr(fname, 'h');
+ if(dotH && fname < dotH && dotH[-1] == '.' && !dotH[1]) {
+ what_kind = "HDRS";
+ } else {
+ what_kind = "SRCS";
+ }
+ safe_fprintf(mkf, "ASN_MODULE_%s+=%s\n", what_kind, fname);
}
asn1c_dep_chain_free(dlist);
@@ -149,7 +149,7 @@
"\n\n"
"lib_LTLIBRARIES=libasncodec.la\n"
"libasncodec_la_SOURCES="
- "$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)\n"
+ "$(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS)\n"
"libasncodec_la_CFLAGS=$(ASN_MODULE_CFLAGS)\n");
fclose(mkf);
safe_fprintf(stderr, "Generated Makefile.am.targets\n");
@@ -176,7 +176,7 @@
"CFLAGS += $(ASN_MODULE_CFLAGS) %s%s-I.\n"
"ASN_LIBRARY ?= libasncodec.a\n"
"ASN_PROGRAM ?= converter-example\n"
- "ASN_PROGRAM_SOURCES ?= ",
+ "ASN_PROGRAM_SRCS ?= ",
library_makefile_name,
(arg->flags & A1C_PDU_TYPE) ? generate_pdu_C_definition() : "",
need_to_generate_pdu_collection(arg) ? "-DASN_PDU_COLLECTION " : "");
@@ -209,17 +209,17 @@
safe_fprintf(
mkf,
"\n\nall: $(ASN_PROGRAM)\n"
- "\n$(ASN_PROGRAM): $(ASN_LIBRARY) $(ASN_PROGRAM_SOURCES:.c=.o)"
- "\n\t$(CC) $(CFLAGS) $(CPPFLAGS) -o $(ASN_PROGRAM) $(ASN_PROGRAM_SOURCES:.c=.o) $(LDFLAGS) $(ASN_LIBRARY) $(LIBS)\n"
- "\n$(ASN_LIBRARY): $(ASN_MODULE_SOURCES:.c=.o)"
- "\n\t$(AR) rcs $@ $(ASN_MODULE_SOURCES:.c=.o)\n"
+ "\n$(ASN_PROGRAM): $(ASN_LIBRARY) $(ASN_PROGRAM_SRCS:.c=.o)"
+ "\n\t$(CC) $(CFLAGS) $(CPPFLAGS) -o $(ASN_PROGRAM) $(ASN_PROGRAM_SRCS:.c=.o) $(LDFLAGS) $(ASN_LIBRARY) $(LIBS)\n"
+ "\n$(ASN_LIBRARY): $(ASN_MODULE_SRCS:.c=.o)"
+ "\n\t$(AR) rcs $@ $(ASN_MODULE_SRCS:.c=.o)\n"
"\n.SUFFIXES:"
"\n.SUFFIXES: .c .o\n"
"\n.c.o:"
"\n\t$(CC) $(CFLAGS) -o $@ -c $<\n"
"\nclean:"
"\n\trm -f $(ASN_PROGRAM) $(ASN_LIBRARY)"
- "\n\trm -f $(ASN_MODULE_SOURCES:.c=.o) $(ASN_PROGRAM_SOURCES:.c=.o)\n"
+ "\n\trm -f $(ASN_MODULE_SRCS:.c=.o) $(ASN_PROGRAM_SRCS:.c=.o)\n"
"\nregen: regenerate-from-asn1-source\n"
"\nregenerate-from-asn1-source:\n\t");
diff --git a/tests/tests-c-compiler/check-assembly.sh b/tests/tests-c-compiler/check-assembly.sh
index 4a3e5e9..a0f0f93 100755
--- a/tests/tests-c-compiler/check-assembly.sh
+++ b/tests/tests-c-compiler/check-assembly.sh
@@ -79,7 +79,7 @@
ASAN_ENV_FLAGS = ${ASAN_ENV_FLAGS:-}
ASN_PROGRAM = check-program
-ASN_PROGRAM_SOURCES = ${source_short}
+ASN_PROGRAM_SRCS = ${source_short}
CC ?= ${CC}
CXX ?= ${CXX}
diff --git a/tests/tests-randomized/check-bundles.sh b/tests/tests-randomized/check-bundles.sh
index f62f629..e1d59c6 100755
--- a/tests/tests-randomized/check-bundles.sh
+++ b/tests/tests-randomized/check-bundles.sh
@@ -284,11 +284,11 @@
{
echo "CFLAGS+= -DASN1_TEXT='$short_asn'";
echo "ASN_PROGRAM = random-test-driver"
- echo "ASN_PROGRAM_SOURCES = random-test-driver.c"
+ echo "ASN_PROGRAM_SRCS = random-test-driver.c"
echo
echo "include Makefile.am.example"
echo
- echo "all-tests-succeeded: ${abs_top_builddir}/asn1c/asn1c \$(ASN_PROGRAM_SOURCES) \$(ASN_MODULE_SOURCES) \$(ASN_MODULE_HEADERS)"
+ echo "all-tests-succeeded: ${abs_top_builddir}/asn1c/asn1c \$(ASN_PROGRAM_SRCS) \$(ASN_MODULE_SRCS) \$(ASN_MODULE_HDRS)"
echo " @rm -f \$@"
echo " @echo Previous try did not go correctly. To reproduce:"
echo " @cat .test-reproduce"