diff options
| author | Lev Walkin <vlm@lionet.info> | 2006-09-17 04:52:50 +0000 |
|---|---|---|
| committer | Lev Walkin <vlm@lionet.info> | 2006-09-17 04:52:50 +0000 |
| commit | a9532f4d2bad200422ffacae45342c73f7cb40cb (patch) | |
| tree | 07a38fc49e3ffb8293361d4e3347c89e9b94766b /examples | |
| parent | cc7c94efce47bc02ce5bd60a93f25d32b1b23b50 (diff) | |
moved -DASN_PDU_COLLECTION into compiler
Diffstat (limited to 'examples')
| -rwxr-xr-x | examples/sample.makefile.regen | 15 | ||||
| -rw-r--r-- | examples/sample.source.RRC/Makefile | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/examples/sample.makefile.regen b/examples/sample.makefile.regen index f34f0a26..ba035148 100755 --- a/examples/sample.makefile.regen +++ b/examples/sample.makefile.regen @@ -23,8 +23,6 @@ if test -z "$ASN1PDU" \ exit fi -ASN1DEFPDU=`echo "$ASN1PDU" | tr - _` - ../../asn1c/asn1c -S ../../skeletons ${ASN1CMDOPTS} ${ASN1MODULES} || exit $? if test ! -f Makefile.am.sample ; then @@ -32,20 +30,15 @@ if test ! -f Makefile.am.sample ; then exit 1 fi -CFLAGS="" - +ASN1DEFPDU=`echo "$ASN1PDU" | tr - _` +CFLAGS="-DPDU=${ASN1DEFPDU}" if test -f config.h ; then - CFLAGS="$CFLAGS -DHAVE_CONFIG_H" -fi - -FIXEDPDU=`echo "[$ASN1CMDOPTS]" | sed -e "s/.*-pdu=auto.*//"` -if test ! "$FIXEDPDU" ; then - CFLAGS="$CFLAGS -DASN_PDU_COLLECTION" + CFLAGS="-DHAVE_CONFIG_H $CFLAGS" fi set -x cat Makefile.am.sample \ - | sed -e "s/^CFLAGS.*/CFLAGS +=$CFLAGS -DPDU=${ASN1DEFPDU} -I./" \ + | sed -e "s/^CFLAGS += /CFLAGS += ${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 db38e980..717e7342 100644 --- a/examples/sample.source.RRC/Makefile +++ b/examples/sample.source.RRC/Makefile @@ -4740,7 +4740,7 @@ libsomething_la_SOURCES=$(ASN_MODULE_SOURCES) $(ASN_MODULE_HEADERS) # 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 -DASN_PDU_COLLECTION -DPDU=DL_DCCH_Message -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) |