osmocom
/
asn1c
mirror of https://gerrit.osmocom.org/asn1c
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename ASN_MODULE_{SOURCES,HEADERS} => ASN_MODULE_{SRCS,HDRS}

This commit is contained in:
Jon Ringle 2017-11-13 21:29:40 -05:00 committed by Lev Walkin
parent 07f8c3eaf5
commit 7871abf7ef
14 changed files with 188 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/sample.makefile.regen
View File

@ -144,9 +144,9 @@ test -n "$TITLE" && EXTRA_CFLAGS="-DASN_CONVERTER_TITLE=\"$TITLE\" ${EXTRA_CFLAG
echo " @if [ -f WIP ]; then cat WIP; sleep 2; fi" echo " @if [ -f WIP ]; then cat WIP; sleep 2; fi"
echo echo
echo "distclean: clean" echo "distclean: clean"
echo ' rm -f $(ASN_MODULE_SOURCES)' echo ' rm -f $(ASN_MODULE_SRCS)'
echo ' rm -f $(ASN_MODULE_HEADERS)' echo ' rm -f $(ASN_MODULE_HDRS)'
echo ' rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS)' echo ' rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)'
echo " rm -f Makefile.am.example" echo " rm -f Makefile.am.example"
} > Makefile } > Makefile

6
examples/sample.source.1609.2/Makefile
View File

@ -101,7 +101,7 @@ maybe-wip-pause:
@if [ -f WIP ]; then cat WIP; sleep 2; fi @if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS) rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example rm -f Makefile.am.example

6
examples/sample.source.J2735/Makefile
View File

@ -101,7 +101,7 @@ maybe-wip-pause:
@if [ -f WIP ]; then cat WIP; sleep 2; fi @if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS) rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example rm -f Makefile.am.example

6
examples/sample.source.LDAP3/Makefile
View File

@ -101,7 +101,7 @@ maybe-wip-pause:
@if [ -f WIP ]; then cat WIP; sleep 2; fi @if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS) rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example rm -f Makefile.am.example

128
examples/sample.source.LTE-RRC/Makefile
View File

@ -1,4 +1,4 @@
ASN_MODULE_SOURCES= \ ASN_MODULE_SRCS= \
BCCH-BCH-Message.c \ BCCH-BCH-Message.c \
BCCH-BCH-MessageType.c \ BCCH-BCH-MessageType.c \
BCCH-BCH-Message-MBMS.c \ BCCH-BCH-Message-MBMS.c \
@ -1754,7 +1754,7 @@ ASN_MODULE_SOURCES= \
ReestablishmentInfo-NB.c \ ReestablishmentInfo-NB.c \
RRM-Config-NB.c RRM-Config-NB.c
ASN_MODULE_HEADERS= \ ASN_MODULE_HDRS= \
BCCH-BCH-Message.h \ BCCH-BCH-Message.h \
BCCH-BCH-MessageType.h \ BCCH-BCH-MessageType.h \
BCCH-BCH-Message-MBMS.h \ BCCH-BCH-Message-MBMS.h \
@ -3510,76 +3510,76 @@ ASN_MODULE_HEADERS= \
ReestablishmentInfo-NB.h \ ReestablishmentInfo-NB.h \
RRM-Config-NB.h RRM-Config-NB.h
ASN_MODULE_HEADERS+=BOOLEAN.h ASN_MODULE_HDRS+=BOOLEAN.h
ASN_MODULE_SOURCES+=BOOLEAN.c ASN_MODULE_SRCS+=BOOLEAN.c
ASN_MODULE_HEADERS+=INTEGER.h ASN_MODULE_HDRS+=INTEGER.h
ASN_MODULE_HEADERS+=NativeEnumerated.h ASN_MODULE_HDRS+=NativeEnumerated.h
ASN_MODULE_SOURCES+=INTEGER.c ASN_MODULE_SRCS+=INTEGER.c
ASN_MODULE_HEADERS+=NULL.h ASN_MODULE_HDRS+=NULL.h
ASN_MODULE_SOURCES+=NULL.c ASN_MODULE_SRCS+=NULL.c
ASN_MODULE_SOURCES+=NativeEnumerated.c ASN_MODULE_SRCS+=NativeEnumerated.c
ASN_MODULE_HEADERS+=NativeInteger.h ASN_MODULE_HDRS+=NativeInteger.h
ASN_MODULE_SOURCES+=NativeInteger.c ASN_MODULE_SRCS+=NativeInteger.c
ASN_MODULE_HEADERS+=asn_SEQUENCE_OF.h ASN_MODULE_HDRS+=asn_SEQUENCE_OF.h
ASN_MODULE_SOURCES+=asn_SEQUENCE_OF.c ASN_MODULE_SRCS+=asn_SEQUENCE_OF.c
ASN_MODULE_HEADERS+=asn_SET_OF.h ASN_MODULE_HDRS+=asn_SET_OF.h
ASN_MODULE_SOURCES+=asn_SET_OF.c ASN_MODULE_SRCS+=asn_SET_OF.c
ASN_MODULE_HEADERS+=constr_CHOICE.h ASN_MODULE_HDRS+=constr_CHOICE.h
ASN_MODULE_SOURCES+=constr_CHOICE.c ASN_MODULE_SRCS+=constr_CHOICE.c
ASN_MODULE_HEADERS+=constr_SEQUENCE.h ASN_MODULE_HDRS+=constr_SEQUENCE.h
ASN_MODULE_SOURCES+=constr_SEQUENCE.c ASN_MODULE_SRCS+=constr_SEQUENCE.c
ASN_MODULE_HEADERS+=constr_SEQUENCE_OF.h ASN_MODULE_HDRS+=constr_SEQUENCE_OF.h
ASN_MODULE_SOURCES+=constr_SEQUENCE_OF.c ASN_MODULE_SRCS+=constr_SEQUENCE_OF.c
ASN_MODULE_HEADERS+=constr_SET_OF.h ASN_MODULE_HDRS+=constr_SET_OF.h
ASN_MODULE_SOURCES+=constr_SET_OF.c ASN_MODULE_SRCS+=constr_SET_OF.c
ASN_MODULE_HEADERS+=asn_application.h ASN_MODULE_HDRS+=asn_application.h
ASN_MODULE_HEADERS+=asn_system.h ASN_MODULE_HDRS+=asn_system.h
ASN_MODULE_HEADERS+=asn_codecs.h ASN_MODULE_HDRS+=asn_codecs.h
ASN_MODULE_HEADERS+=asn_internal.h ASN_MODULE_HDRS+=asn_internal.h
ASN_MODULE_HEADERS+=OCTET_STRING.h ASN_MODULE_HDRS+=OCTET_STRING.h
ASN_MODULE_SOURCES+=OCTET_STRING.c ASN_MODULE_SRCS+=OCTET_STRING.c
ASN_MODULE_HEADERS+=BIT_STRING.h ASN_MODULE_HDRS+=BIT_STRING.h
ASN_MODULE_SOURCES+=BIT_STRING.c ASN_MODULE_SRCS+=BIT_STRING.c
ASN_MODULE_SOURCES+=asn_codecs_prim.c ASN_MODULE_SRCS+=asn_codecs_prim.c
ASN_MODULE_HEADERS+=asn_codecs_prim.h ASN_MODULE_HDRS+=asn_codecs_prim.h
ASN_MODULE_HEADERS+=ber_tlv_length.h ASN_MODULE_HDRS+=ber_tlv_length.h
ASN_MODULE_SOURCES+=ber_tlv_length.c ASN_MODULE_SRCS+=ber_tlv_length.c
ASN_MODULE_HEADERS+=ber_tlv_tag.h ASN_MODULE_HDRS+=ber_tlv_tag.h
ASN_MODULE_SOURCES+=ber_tlv_tag.c ASN_MODULE_SRCS+=ber_tlv_tag.c
ASN_MODULE_HEADERS+=ber_decoder.h ASN_MODULE_HDRS+=ber_decoder.h
ASN_MODULE_SOURCES+=ber_decoder.c ASN_MODULE_SRCS+=ber_decoder.c
ASN_MODULE_HEADERS+=der_encoder.h ASN_MODULE_HDRS+=der_encoder.h
ASN_MODULE_SOURCES+=der_encoder.c ASN_MODULE_SRCS+=der_encoder.c
ASN_MODULE_HEADERS+=constr_TYPE.h ASN_MODULE_HDRS+=constr_TYPE.h
ASN_MODULE_SOURCES+=constr_TYPE.c ASN_MODULE_SRCS+=constr_TYPE.c
ASN_MODULE_HEADERS+=constraints.h ASN_MODULE_HDRS+=constraints.h
ASN_MODULE_SOURCES+=constraints.c ASN_MODULE_SRCS+=constraints.c
ASN_MODULE_HEADERS+=xer_support.h ASN_MODULE_HDRS+=xer_support.h
ASN_MODULE_SOURCES+=xer_support.c ASN_MODULE_SRCS+=xer_support.c
ASN_MODULE_HEADERS+=xer_decoder.h ASN_MODULE_HDRS+=xer_decoder.h
ASN_MODULE_SOURCES+=xer_decoder.c ASN_MODULE_SRCS+=xer_decoder.c
ASN_MODULE_HEADERS+=xer_encoder.h ASN_MODULE_HDRS+=xer_encoder.h
ASN_MODULE_SOURCES+=xer_encoder.c ASN_MODULE_SRCS+=xer_encoder.c
ASN_MODULE_HEADERS+=per_support.h ASN_MODULE_HDRS+=per_support.h
ASN_MODULE_SOURCES+=per_support.c ASN_MODULE_SRCS+=per_support.c
ASN_MODULE_HEADERS+=per_decoder.h ASN_MODULE_HDRS+=per_decoder.h
ASN_MODULE_SOURCES+=per_decoder.c ASN_MODULE_SRCS+=per_decoder.c
ASN_MODULE_HEADERS+=per_encoder.h ASN_MODULE_HDRS+=per_encoder.h
ASN_MODULE_SOURCES+=per_encoder.c ASN_MODULE_SRCS+=per_encoder.c
ASN_MODULE_HEADERS+=per_opentype.h ASN_MODULE_HDRS+=per_opentype.h
ASN_MODULE_SOURCES+=per_opentype.c ASN_MODULE_SRCS+=per_opentype.c
ASN_CONVERTER_SOURCES+=converter-sample.c ASN_CONVERTER_SOURCES+=converter-sample.c
ASN_CONVERTER_SOURCES+=pdu_collection.c ASN_CONVERTER_SOURCES+=pdu_collection.c
lib_LTLIBRARIES=libsomething.la 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) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = lte-rrc-dump TARGET = lte-rrc-dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=DL_DCCH_Message -DASN_PDU_COLLECTION -I. 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) all: DL-DCCH-Message.c $(TARGET)
@ -3678,7 +3678,7 @@ check-per:
done; done; fi done; done; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_CONVERTER_SOURCES) $(ASN_CONVERTER_HEADERS) rm -f $(ASN_CONVERTER_SOURCES) $(ASN_CONVERTER_HEADERS)
rm -f Makefile.am.sample rm -f Makefile.am.sample

6
examples/sample.source.MEGACO/Makefile
View File

@ -100,7 +100,7 @@ maybe-wip-pause:
@if [ -f WIP ]; then cat WIP; sleep 2; fi @if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS) rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example rm -f Makefile.am.example

132
examples/sample.source.MHEG5/Makefile
View File

@ -1,4 +1,4 @@
ASN_MODULE_SOURCES= \ ASN_MODULE_SRCS= \
InterchangedObject.c \ InterchangedObject.c \
RootClass.c \ RootClass.c \
GroupClass.c \ GroupClass.c \
@ -188,7 +188,7 @@ ASN_MODULE_SOURCES= \
Colour.c \ Colour.c \
XYPosition.c XYPosition.c
ASN_MODULE_HEADERS= \ ASN_MODULE_HDRS= \
InterchangedObject.h \ InterchangedObject.h \
RootClass.h \ RootClass.h \
GroupClass.h \ GroupClass.h \
@ -378,77 +378,77 @@ ASN_MODULE_HEADERS= \
Colour.h \ Colour.h \
XYPosition.h XYPosition.h
ASN_MODULE_HEADERS+=BOOLEAN.h ASN_MODULE_HDRS+=BOOLEAN.h
ASN_MODULE_SOURCES+=BOOLEAN.c ASN_MODULE_SRCS+=BOOLEAN.c
ASN_MODULE_HEADERS+=INTEGER.h ASN_MODULE_HDRS+=INTEGER.h
ASN_MODULE_HEADERS+=NativeEnumerated.h ASN_MODULE_HDRS+=NativeEnumerated.h
ASN_MODULE_SOURCES+=INTEGER.c ASN_MODULE_SRCS+=INTEGER.c
ASN_MODULE_HEADERS+=NULL.h ASN_MODULE_HDRS+=NULL.h
ASN_MODULE_SOURCES+=NULL.c ASN_MODULE_SRCS+=NULL.c
ASN_MODULE_SOURCES+=NativeEnumerated.c ASN_MODULE_SRCS+=NativeEnumerated.c
ASN_MODULE_HEADERS+=NativeInteger.h ASN_MODULE_HDRS+=NativeInteger.h
ASN_MODULE_SOURCES+=NativeInteger.c ASN_MODULE_SRCS+=NativeInteger.c
ASN_MODULE_HEADERS+=asn_SEQUENCE_OF.h ASN_MODULE_HDRS+=asn_SEQUENCE_OF.h
ASN_MODULE_SOURCES+=asn_SEQUENCE_OF.c ASN_MODULE_SRCS+=asn_SEQUENCE_OF.c
ASN_MODULE_HEADERS+=asn_SET_OF.h ASN_MODULE_HDRS+=asn_SET_OF.h
ASN_MODULE_SOURCES+=asn_SET_OF.c ASN_MODULE_SRCS+=asn_SET_OF.c
ASN_MODULE_HEADERS+=constr_CHOICE.h ASN_MODULE_HDRS+=constr_CHOICE.h
ASN_MODULE_SOURCES+=constr_CHOICE.c ASN_MODULE_SRCS+=constr_CHOICE.c
ASN_MODULE_HEADERS+=constr_SEQUENCE.h ASN_MODULE_HDRS+=constr_SEQUENCE.h
ASN_MODULE_SOURCES+=constr_SEQUENCE.c ASN_MODULE_SRCS+=constr_SEQUENCE.c
ASN_MODULE_HEADERS+=constr_SEQUENCE_OF.h ASN_MODULE_HDRS+=constr_SEQUENCE_OF.h
ASN_MODULE_SOURCES+=constr_SEQUENCE_OF.c ASN_MODULE_SRCS+=constr_SEQUENCE_OF.c
ASN_MODULE_HEADERS+=constr_SET_OF.h ASN_MODULE_HDRS+=constr_SET_OF.h
ASN_MODULE_HEADERS+=constr_SET.h ASN_MODULE_HDRS+=constr_SET.h
ASN_MODULE_SOURCES+=constr_SET.c ASN_MODULE_SRCS+=constr_SET.c
ASN_MODULE_SOURCES+=constr_SET_OF.c ASN_MODULE_SRCS+=constr_SET_OF.c
ASN_MODULE_HEADERS+=asn_application.h ASN_MODULE_HDRS+=asn_application.h
ASN_MODULE_HEADERS+=asn_system.h ASN_MODULE_HDRS+=asn_system.h
ASN_MODULE_HEADERS+=asn_codecs.h ASN_MODULE_HDRS+=asn_codecs.h
ASN_MODULE_HEADERS+=asn_internal.h ASN_MODULE_HDRS+=asn_internal.h
ASN_MODULE_HEADERS+=OCTET_STRING.h ASN_MODULE_HDRS+=OCTET_STRING.h
ASN_MODULE_SOURCES+=OCTET_STRING.c ASN_MODULE_SRCS+=OCTET_STRING.c
ASN_MODULE_HEADERS+=BIT_STRING.h ASN_MODULE_HDRS+=BIT_STRING.h
ASN_MODULE_SOURCES+=BIT_STRING.c ASN_MODULE_SRCS+=BIT_STRING.c
ASN_MODULE_SOURCES+=asn_codecs_prim.c ASN_MODULE_SRCS+=asn_codecs_prim.c
ASN_MODULE_HEADERS+=asn_codecs_prim.h ASN_MODULE_HDRS+=asn_codecs_prim.h
ASN_MODULE_HEADERS+=ber_tlv_length.h ASN_MODULE_HDRS+=ber_tlv_length.h
ASN_MODULE_SOURCES+=ber_tlv_length.c ASN_MODULE_SRCS+=ber_tlv_length.c
ASN_MODULE_HEADERS+=ber_tlv_tag.h ASN_MODULE_HDRS+=ber_tlv_tag.h
ASN_MODULE_SOURCES+=ber_tlv_tag.c ASN_MODULE_SRCS+=ber_tlv_tag.c
ASN_MODULE_HEADERS+=ber_decoder.h ASN_MODULE_HDRS+=ber_decoder.h
ASN_MODULE_SOURCES+=ber_decoder.c ASN_MODULE_SRCS+=ber_decoder.c
ASN_MODULE_HEADERS+=der_encoder.h ASN_MODULE_HDRS+=der_encoder.h
ASN_MODULE_SOURCES+=der_encoder.c ASN_MODULE_SRCS+=der_encoder.c
ASN_MODULE_HEADERS+=constr_TYPE.h ASN_MODULE_HDRS+=constr_TYPE.h
ASN_MODULE_SOURCES+=constr_TYPE.c ASN_MODULE_SRCS+=constr_TYPE.c
ASN_MODULE_HEADERS+=constraints.h ASN_MODULE_HDRS+=constraints.h
ASN_MODULE_SOURCES+=constraints.c ASN_MODULE_SRCS+=constraints.c
ASN_MODULE_HEADERS+=xer_support.h ASN_MODULE_HDRS+=xer_support.h
ASN_MODULE_SOURCES+=xer_support.c ASN_MODULE_SRCS+=xer_support.c
ASN_MODULE_HEADERS+=xer_decoder.h ASN_MODULE_HDRS+=xer_decoder.h
ASN_MODULE_SOURCES+=xer_decoder.c ASN_MODULE_SRCS+=xer_decoder.c
ASN_MODULE_HEADERS+=xer_encoder.h ASN_MODULE_HDRS+=xer_encoder.h
ASN_MODULE_SOURCES+=xer_encoder.c ASN_MODULE_SRCS+=xer_encoder.c
ASN_MODULE_HEADERS+=per_support.h ASN_MODULE_HDRS+=per_support.h
ASN_MODULE_SOURCES+=per_support.c ASN_MODULE_SRCS+=per_support.c
ASN_MODULE_HEADERS+=per_decoder.h ASN_MODULE_HDRS+=per_decoder.h
ASN_MODULE_SOURCES+=per_decoder.c ASN_MODULE_SRCS+=per_decoder.c
ASN_MODULE_HEADERS+=per_encoder.h ASN_MODULE_HDRS+=per_encoder.h
ASN_MODULE_SOURCES+=per_encoder.c ASN_MODULE_SRCS+=per_encoder.c
ASN_MODULE_HEADERS+=per_opentype.h ASN_MODULE_HDRS+=per_opentype.h
ASN_MODULE_SOURCES+=per_opentype.c ASN_MODULE_SRCS+=per_opentype.c
ASN_CONVERTER_SOURCES+=converter-sample.c ASN_CONVERTER_SOURCES+=converter-sample.c
lib_LTLIBRARIES=libsomething.la 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) # This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file # Remove the lines below to convert it into a pure .am file
TARGET = mheg5dump TARGET = mheg5dump
CFLAGS += -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=InterchangedObject -I. 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) all: InterchangedObject.c $(TARGET)
@ -547,7 +547,7 @@ check-per:
done; done; fi done; done; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_CONVERTER_SOURCES) $(ASN_CONVERTER_HEADERS) rm -f $(ASN_CONVERTER_SOURCES) $(ASN_CONVERTER_HEADERS)
rm -f Makefile.am.sample rm -f Makefile.am.sample

6
examples/sample.source.PKIX1/Makefile
View File

@ -100,7 +100,7 @@ maybe-wip-pause:
@if [ -f WIP ]; then cat WIP; sleep 2; fi @if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS) rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example rm -f Makefile.am.example

6
examples/sample.source.RRC/Makefile
View File

@ -100,7 +100,7 @@ maybe-wip-pause:
@if [ -f WIP ]; then cat WIP; sleep 2; fi @if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS) rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example rm -f Makefile.am.example

6
examples/sample.source.TAP3/Makefile
View File

@ -101,7 +101,7 @@ maybe-wip-pause:
@if [ -f WIP ]; then cat WIP; sleep 2; fi @if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS) rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example rm -f Makefile.am.example

6
examples/sample.source.ULP/Makefile
View File

@ -101,7 +101,7 @@ maybe-wip-pause:
@if [ -f WIP ]; then cat WIP; sleep 2; fi @if [ -f WIP ]; then cat WIP; sleep 2; fi
distclean: clean distclean: clean
rm -f $(ASN_MODULE_SOURCES) rm -f $(ASN_MODULE_SRCS)
rm -f $(ASN_MODULE_HEADERS) rm -f $(ASN_MODULE_HDRS)
rm -f $(ASN_PROGRAM_SOURCES) $(ASN_PROGRAM_HEADERS) rm -f $(ASN_PROGRAM_SRCS) $(ASN_PROGRAM_HDRS)
rm -f Makefile.am.example rm -f Makefile.am.example

56
libasn1compiler/asn1c_save.c
View File

@ -65,7 +65,7 @@ asn1c__save_library_makefile(arg_t *arg, const asn1c_dep_chainset *deps,
return -1; return -1;
} }
safe_fprintf(mkf, "ASN_MODULE_SOURCES="); safe_fprintf(mkf, "ASN_MODULE_SRCS=");
TQ_FOR(mod, &(arg->asn->modules), mod_next) { TQ_FOR(mod, &(arg->asn->modules), mod_next) {
TQ_FOR(arg->expr, &(mod->members), next) { TQ_FOR(arg->expr, &(mod->members), next) {
if(asn1_lang_map[arg->expr->meta_type] if(asn1_lang_map[arg->expr->meta_type]
@ -75,7 +75,7 @@ asn1c__save_library_makefile(arg_t *arg, const asn1c_dep_chainset *deps,
} }
} }
} }
safe_fprintf(mkf, "\n\nASN_MODULE_HEADERS="); safe_fprintf(mkf, "\n\nASN_MODULE_HDRS=");
TQ_FOR(mod, &(arg->asn->modules), mod_next) { TQ_FOR(mod, &(arg->asn->modules), mod_next) {
TQ_FOR(arg->expr, &(mod->members), next) { TQ_FOR(arg->expr, &(mod->members), next) {
if(asn1_lang_map[arg->expr->meta_type] if(asn1_lang_map[arg->expr->meta_type]
@ -101,37 +101,37 @@ asn1c__save_library_makefile(arg_t *arg, const asn1c_dep_chainset *deps,
dir_end = dstpath + dlen; dir_end = dstpath + dlen;
*dir_end++ = '/'; *dir_end++ = '/';
for(size_t i = 0; i < dlist->deps_count; i++) { for(size_t i = 0; i < dlist->deps_count; i++) {
char where[32]; /* Location of the */ char where[32]; /* Location of the */
char *what_kind; /* HEADERS or SOURCES */ char *what_kind; /* HDRS or SRCS */
const asn1c_dep_filename *dep_file = dlist->deps[i]; const asn1c_dep_filename *dep_file = dlist->deps[i];
char *fname = dep_file->filename; char *fname = dep_file->filename;
char *dotH; char *dotH;
assert(strlen(fname) < (sizeof(dstpath) / 2)); assert(strlen(fname) < (sizeof(dstpath) / 2));
strcpy(dir_end, fname); strcpy(dir_end, fname);
if(arg->flags & A1C_DEBUG) { if(arg->flags & A1C_DEBUG) {
snprintf(where, sizeof(where), "(line %d col %d)", snprintf(where, sizeof(where), "(line %d col %d)",
dep_file->lineno, dep_file->column); dep_file->lineno, dep_file->column);
} else { } else {
where[0] = '\0'; where[0] = '\0';
} }
if(asn1c_copy_over(arg, dstpath, where) == -1) { if(asn1c_copy_over(arg, dstpath, where) == -1) {
safe_fprintf(mkf, ">>>ABORTED<<<"); safe_fprintf(mkf, ">>>ABORTED<<<");
fclose(mkf); fclose(mkf);
return -1; return -1;
} }
/* HEADERS versus SOURCES */ /* HDRS versus SRCS */
dotH = strrchr(fname, 'h'); dotH = strrchr(fname, 'h');
if(dotH && fname < dotH && dotH[-1] == '.' && !dotH[1]) { if(dotH && fname < dotH && dotH[-1] == '.' && !dotH[1]) {
what_kind = "HEADERS"; what_kind = "HDRS";
} else { } else {
what_kind = "SOURCES"; what_kind = "SRCS";
} }
safe_fprintf(mkf, "ASN_MODULE_%s+=%s\n", what_kind, fname); safe_fprintf(mkf, "ASN_MODULE_%s+=%s\n", what_kind, fname);
} }
asn1c_dep_chain_free(dlist); asn1c_dep_chain_free(dlist);
@ -149,7 +149,7 @@ asn1c__save_library_makefile(arg_t *arg, const asn1c_dep_chainset *deps,
"\n\n" "\n\n"
"lib_LTLIBRARIES=libasncodec.la\n" "lib_LTLIBRARIES=libasncodec.la\n"
"libasncodec_la_SOURCES=" "libasncodec_la_SOURCES="
"$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)\n" "$(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS)\n"
"libasncodec_la_CFLAGS=$(ASN_MODULE_CFLAGS)\n"); "libasncodec_la_CFLAGS=$(ASN_MODULE_CFLAGS)\n");
fclose(mkf); fclose(mkf);
safe_fprintf(stderr, "Generated Makefile.am.targets\n"); safe_fprintf(stderr, "Generated Makefile.am.targets\n");
@ -176,7 +176,7 @@ asn1c__save_example_makefile(arg_t *arg, const asn1c_dep_chainset *deps,
"CFLAGS += $(ASN_MODULE_CFLAGS) %s%s-I.\n" "CFLAGS += $(ASN_MODULE_CFLAGS) %s%s-I.\n"
"ASN_LIBRARY ?= libasncodec.a\n" "ASN_LIBRARY ?= libasncodec.a\n"
"ASN_PROGRAM ?= converter-example\n" "ASN_PROGRAM ?= converter-example\n"
"ASN_PROGRAM_SOURCES ?= ", "ASN_PROGRAM_SRCS ?= ",
library_makefile_name, library_makefile_name,
(arg->flags & A1C_PDU_TYPE) ? generate_pdu_C_definition() : "", (arg->flags & A1C_PDU_TYPE) ? generate_pdu_C_definition() : "",
need_to_generate_pdu_collection(arg) ? "-DASN_PDU_COLLECTION " : ""); need_to_generate_pdu_collection(arg) ? "-DASN_PDU_COLLECTION " : "");
@ -209,17 +209,17 @@ asn1c__save_example_makefile(arg_t *arg, const asn1c_dep_chainset *deps,
safe_fprintf( safe_fprintf(
mkf, mkf,
"\n\nall: $(ASN_PROGRAM)\n" "\n\nall: $(ASN_PROGRAM)\n"
"\n$(ASN_PROGRAM): $(ASN_LIBRARY) $(ASN_PROGRAM_SOURCES:.c=.o)" "\n$(ASN_PROGRAM): $(ASN_LIBRARY) $(ASN_PROGRAM_SRCS:.c=.o)"
"\n\t$(CC) $(CFLAGS) $(CPPFLAGS) -o $(ASN_PROGRAM) $(ASN_PROGRAM_SOURCES:.c=.o) $(LDFLAGS) $(ASN_LIBRARY) $(LIBS)\n" "\n\t$(CC) $(CFLAGS) $(CPPFLAGS) -o $(ASN_PROGRAM) $(ASN_PROGRAM_SRCS:.c=.o) $(LDFLAGS) $(ASN_LIBRARY) $(LIBS)\n"
"\n$(ASN_LIBRARY): $(ASN_MODULE_SOURCES:.c=.o)" "\n$(ASN_LIBRARY): $(ASN_MODULE_SRCS:.c=.o)"
"\n\t$(AR) rcs $@ $(ASN_MODULE_SOURCES:.c=.o)\n" "\n\t$(AR) rcs $@ $(ASN_MODULE_SRCS:.c=.o)\n"
"\n.SUFFIXES:" "\n.SUFFIXES:"
"\n.SUFFIXES: .c .o\n" "\n.SUFFIXES: .c .o\n"
"\n.c.o:" "\n.c.o:"
"\n\t$(CC) $(CFLAGS) -o $@ -c $<\n" "\n\t$(CC) $(CFLAGS) -o $@ -c $<\n"
"\nclean:" "\nclean:"
"\n\trm -f $(ASN_PROGRAM) $(ASN_LIBRARY)" "\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" "\nregen: regenerate-from-asn1-source\n"
"\nregenerate-from-asn1-source:\n\t"); "\nregenerate-from-asn1-source:\n\t");

2
tests/tests-c-compiler/check-assembly.sh
View File

@ -79,7 +79,7 @@ LDFLAGS = ${LDFLAGS:-}
ASAN_ENV_FLAGS = ${ASAN_ENV_FLAGS:-} ASAN_ENV_FLAGS = ${ASAN_ENV_FLAGS:-}
ASN_PROGRAM = check-program ASN_PROGRAM = check-program
ASN_PROGRAM_SOURCES = ${source_short} ASN_PROGRAM_SRCS = ${source_short}
CC ?= ${CC} CC ?= ${CC}
CXX ?= ${CXX} CXX ?= ${CXX}

4
tests/tests-randomized/check-bundles.sh
View File

@ -284,11 +284,11 @@ asn_compile() {
{ {
echo "CFLAGS+= -DASN1_TEXT='$short_asn'"; echo "CFLAGS+= -DASN1_TEXT='$short_asn'";
echo "ASN_PROGRAM = random-test-driver" echo "ASN_PROGRAM = random-test-driver"
echo "ASN_PROGRAM_SOURCES = random-test-driver.c" echo "ASN_PROGRAM_SRCS = random-test-driver.c"
echo echo
echo "include Makefile.am.example" echo "include Makefile.am.example"
echo 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 " @rm -f \$@"
echo " @echo Previous try did not go correctly. To reproduce:" echo " @echo Previous try did not go correctly. To reproduce:"
echo " @cat .test-reproduce" echo " @cat .test-reproduce"