From 2fd86de8a8baf3253a60d6c0843a52b5632cbc3f Mon Sep 17 00:00:00 2001 From: Lev Walkin Date: Wed, 13 Sep 2006 02:10:23 +0000 Subject: [PATCH] *** empty log message *** --- examples/Makefile.am | 2 +- examples/Makefile.in | 2 +- examples/sample.makefile.regen | 50 ++++++++++++++++++++++++++ examples/sample.source.LDAP3/Makefile | 4 +-- examples/sample.source.MEGACO/Makefile | 4 +-- examples/sample.source.MHEG5/Makefile | 4 +-- examples/sample.source.PKIX1/Makefile | 4 +-- examples/sample.source.TAP3/Makefile | 4 +-- 8 files changed, 62 insertions(+), 12 deletions(-) create mode 100755 examples/sample.makefile.regen diff --git a/examples/Makefile.am b/examples/Makefile.am index 9b5b07ad..d0ecbd03 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -26,7 +26,7 @@ $(ASN1_FILES_3): crfc2asn1.pl $(ASN1_SOURCE_3) ./crfc2asn1.pl $(ASN1_SOURCE_3) EXTRA_DIST = $(srcdir)/rfc*.txt \ - $(srcdir)/sample.regen.makefile \ + $(srcdir)/sample.makefile.regen \ $(srcdir)/sample.source.*/README \ $(srcdir)/sample.source.*/config.h \ $(srcdir)/sample.source.*/Makefile \ diff --git a/examples/Makefile.in b/examples/Makefile.in index 08d78a74..26fa5c6f 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -177,7 +177,7 @@ ASN1_FILES_3 = \ rfc4511-Lightweight-Directory-Access-Protocol-V3.asn1 EXTRA_DIST = $(srcdir)/rfc*.txt \ - $(srcdir)/sample.regen.makefile \ + $(srcdir)/sample.makefile.regen \ $(srcdir)/sample.source.*/README \ $(srcdir)/sample.source.*/config.h \ $(srcdir)/sample.source.*/Makefile \ diff --git a/examples/sample.makefile.regen b/examples/sample.makefile.regen new file mode 100755 index 00000000..134e1f24 --- /dev/null +++ b/examples/sample.makefile.regen @@ -0,0 +1,50 @@ +#!/bin/sh + +if [ -z "$ASN1PDU" \ + -o -z "$ASN1MODULES" \ + -o -z "$PROGNAME" \ + ]; then + echo "ASN1PDU=\"$ASN1PDU\"" + echo "ASN1MODULES=\"$ASN1MODULES\"" + echo "PROGNAME=\"$PROGNAME\"" + echo "ASN1PDU, ASN1MODULES, and PROGNAME must be set" + exit +fi + +../../asn1c/asn1c -S ../../skeletons ${ASN1CMDOPTS} ${ASN1MODULES} || exit $? + +if [ ! -f Makefile.am.sample ]; then + echo "Makefile.am.sample is missing" + exit 1 +fi + +set -x +cat Makefile.am.sample \ + | sed -e "s/^CFLAGS.*/CFLAGS += -I. -DHAVE_CONFIG_H -DPDU=${ASN1PDU}/" \ + | sed -e "s/^all: /all: ${ASN1PDU}.c /" \ + | sed -e "s/progname/${PROGNAME}/" \ + > Makefile.$$ + +( echo + echo "${ASN1PDU}.c: $0" + echo " ASN1CMDOPTS=\"${ASN1CMDOPTS}\" \\" + echo " ASN1MODULES=\"${ASN1MODULES}\" \\" + echo " ASN1PDU=${ASN1PDU} \\" + echo " PROGNAME=${PROGNAME} \\" + echo " $0" + echo " @touch ${ASN1PDU}.c" + echo " make" + echo + echo "distclean: clean" + echo ' rm -f $(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS)' + echo ' rm -f $(ASN_CONVERTER_SOURCES) $(ASN_CONVERTER_HEADERS)' + echo " rm -f Makefile.am.sample" +) >> Makefile.$$ + +rm Makefile.am.sample || exit $? + +mv Makefile.$$ Makefile + +set +x +echo +echo "Makefile generation finished" diff --git a/examples/sample.source.LDAP3/Makefile b/examples/sample.source.LDAP3/Makefile index 06a4ef77..f7dfc64b 100644 --- a/examples/sample.source.LDAP3/Makefile +++ b/examples/sample.source.LDAP3/Makefile @@ -187,12 +187,12 @@ regenerate-from-asn1-source: ../../asn1c/asn1c -S ../../skeletons -fcompound-names ../rfc4511-Lightweight-Directory-Access-Protocol-V3.asn1 -LDAPMessage.c: ../sample.regen.makefile +LDAPMessage.c: ../sample.makefile.regen ASN1CMDOPTS="-fcompound-names" \ ASN1MODULES="../rfc4511-Lightweight-Directory-Access-Protocol-V3.asn1" \ ASN1PDU=LDAPMessage \ PROGNAME=ldap3dump \ - ../sample.regen.makefile + ../sample.makefile.regen @touch LDAPMessage.c make diff --git a/examples/sample.source.MEGACO/Makefile b/examples/sample.source.MEGACO/Makefile index 601d454b..d922a9da 100644 --- a/examples/sample.source.MEGACO/Makefile +++ b/examples/sample.source.MEGACO/Makefile @@ -309,12 +309,12 @@ regenerate-from-asn1-source: ../../asn1c/asn1c -S ../../skeletons -fcompound-names ../rfc3525-MEDIA-GATEWAY-CONTROL.asn1 -MegacoMessage.c: ../sample.regen.makefile +MegacoMessage.c: ../sample.makefile.regen ASN1CMDOPTS="-fcompound-names" \ ASN1MODULES="../rfc3525-MEDIA-GATEWAY-CONTROL.asn1" \ ASN1PDU=MegacoMessage \ PROGNAME=megacoDump \ - ../sample.regen.makefile + ../sample.makefile.regen @touch MegacoMessage.c make diff --git a/examples/sample.source.MHEG5/Makefile b/examples/sample.source.MHEG5/Makefile index dfceb950..641f518c 100644 --- a/examples/sample.source.MHEG5/Makefile +++ b/examples/sample.source.MHEG5/Makefile @@ -477,12 +477,12 @@ regenerate-from-asn1-source: ../../asn1c/asn1c -S ../../skeletons -fcompound-names ../ISO13522-MHEG-5.asn -InterchangedObject.c: ../sample.regen.makefile +InterchangedObject.c: ../sample.makefile.regen ASN1CMDOPTS="-fcompound-names" \ ASN1MODULES="../ISO13522-MHEG-5.asn" \ ASN1PDU=InterchangedObject \ PROGNAME=mheg5dump \ - ../sample.regen.makefile + ../sample.makefile.regen @touch InterchangedObject.c make diff --git a/examples/sample.source.PKIX1/Makefile b/examples/sample.source.PKIX1/Makefile index 96407254..30e89518 100644 --- a/examples/sample.source.PKIX1/Makefile +++ b/examples/sample.source.PKIX1/Makefile @@ -369,12 +369,12 @@ regenerate-from-asn1-source: ../../asn1c/asn1c -S ../../skeletons ../rfc3280-PKIX1Explicit88.asn1 ../rfc3280-PKIX1Implicit88.asn1 -Certificate.c: ../sample.regen.makefile +Certificate.c: ../sample.makefile.regen ASN1CMDOPTS="" \ ASN1MODULES="../rfc3280-*.asn1" \ ASN1PDU=Certificate \ PROGNAME=x509dump \ - ../sample.regen.makefile + ../sample.makefile.regen @touch Certificate.c make diff --git a/examples/sample.source.TAP3/Makefile b/examples/sample.source.TAP3/Makefile index 43347598..ed00cea8 100644 --- a/examples/sample.source.TAP3/Makefile +++ b/examples/sample.source.TAP3/Makefile @@ -703,12 +703,12 @@ regenerate-from-asn1-source: ../../asn1c/asn1c -S ../../skeletons ../tap3.asn1 -DataInterChange.c: ../sample.regen.makefile +DataInterChange.c: ../sample.makefile.regen ASN1CMDOPTS="" \ ASN1MODULES="../tap3.asn1" \ ASN1PDU=DataInterChange \ PROGNAME=tap3dump \ - ../sample.regen.makefile + ../sample.makefile.regen @touch DataInterChange.c make