-pdu=* changes
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@1238 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/examples/sample.makefile.regen b/examples/sample.makefile.regen
index 5072c18..4c39f78 100755
--- a/examples/sample.makefile.regen
+++ b/examples/sample.makefile.regen
@@ -23,12 +23,14 @@
exit
fi
+CMDOPTS="-pdu=${ASN1PDU} ${ASN1CMDOPTS} ${ASN1MODULES}"
+
if test -x ../../asn1c/asn1c ; then
echo "Compiling ${ASN1MODULES} using local compiler"
- ../../asn1c/asn1c -S ../../skeletons ${ASN1CMDOPTS} ${ASN1MODULES} || exit $?
+ ../../asn1c/asn1c -S ../../skeletons ${CMDOPTS} || exit $?
else
echo "Compiling ${ASN1MODULES} using system compiler"
- asn1c ${ASN1CMDOPTS} ${ASN1MODULES} || exit $?
+ asn1c ${CMDOPTS} || exit $?
fi
if test ! -f Makefile.am.sample ; then
@@ -36,15 +38,14 @@
exit 1
fi
-ASN1DEFPDU=`echo "$ASN1PDU" | tr - _`
-CFLAGS="-DPDU=${ASN1DEFPDU}"
+EXTRA_CFLAGS=""
if test -f config.h ; then
- CFLAGS="-DHAVE_CONFIG_H $CFLAGS"
+ EXTRA_CFLAGS="-DHAVE_CONFIG_H $EXTRA_CFLAGS"
fi
set -x
cat Makefile.am.sample \
- | sed -e "s/^CFLAGS += /CFLAGS += ${CFLAGS} /" \
+ | sed -e "s/^CFLAGS += /CFLAGS += ${EXTRA_CFLAGS} /" \
| sed -e "s/^all: /all: ${ASN1PDU}.c /" \
| sed -e "s/progname/${PROGNAME}/" \
> Makefile.$$
diff --git a/examples/sample.source.RRC/Makefile b/examples/sample.source.RRC/Makefile
index 1ff6d82..42ad07b 100644
--- a/examples/sample.source.RRC/Makefile
+++ b/examples/sample.source.RRC/Makefile
@@ -4740,7 +4740,7 @@
# This file may be used as an input for make(3)
# Remove the lines below to convert it into a pure .am file
TARGET = rrc-dump
-CFLAGS += -DHAVE_CONFIG_H -DPDU=DL_DCCH_Message -DASN_PDU_COLLECTION -I.
+CFLAGS += -DHAVE_CONFIG_H -DPDU=DL_DCCH_Message -DASN_PDU_COLLECTION -I.
OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
all: DL-DCCH-Message.c $(TARGET)
@@ -4761,7 +4761,7 @@
regen: regenerate-from-asn1-source
regenerate-from-asn1-source:
- ../../asn1c/asn1c -S ../../skeletons -fcompound-names -pdu=auto -gen-PER ../rrc.asn1
+ ../../asn1c/asn1c -S ../../skeletons -pdu=DL-DCCH-Message -pdu=auto -fcompound-names -gen-PER ../rrc.asn1
DL-DCCH-Message.c: ../sample.makefile.regen ../rrc.asn1
@@ -4770,7 +4770,7 @@
make
regen-makefile:
- ASN1CMDOPTS="-fcompound-names -pdu=auto -gen-PER" \
+ ASN1CMDOPTS="-pdu=auto -fcompound-names -gen-PER" \
ASN1MODULES="../rrc.asn1" \
ASN1PDU=DL-DCCH-Message \
PROGNAME=rrc-dump \