diff options
| author | Lev Walkin <vlm@lionet.info> | 2017-08-05 22:40:14 -0700 |
|---|---|---|
| committer | Lev Walkin <vlm@lionet.info> | 2017-08-05 22:40:14 -0700 |
| commit | a4f3d4670da5297bb9a4c48565df987848c02336 (patch) | |
| tree | c0a3bfa06d5139341b7a4d7231dfc6e977670cef /examples | |
| parent | 7268f33f6a8122a9c521fe36faaf365c643ee86f (diff) | |
avoid generating some OER object code if not -gen-OER
Diffstat (limited to 'examples')
| -rwxr-xr-x | examples/sample.makefile.regen | 10 | ||||
| -rw-r--r-- | examples/sample.source.J2735/Makefile | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/examples/sample.makefile.regen b/examples/sample.makefile.regen index 4f45d61e..6f8270e3 100755 --- a/examples/sample.makefile.regen +++ b/examples/sample.makefile.regen @@ -38,13 +38,13 @@ if test ! -f Makefile.am.sample ; then exit 1 fi -EXTRA_CFLAGS="-DJUNKTEST -D_DEFAULT_SOURCE ${CFLAGS}" -test -f config.h && EXTRA_CFLAGS="-DHAVE_CONFIG_H ${EXTRA_CFLAGS}" -test -n "$TITLE" && EXTRA_CFLAGS="-DASN_CONVERTER_TITLE=\"$TITLE\" ${EXTRA_CFLAGS}" +EXTRA_CPPFLAGS="-DJUNKTEST -D_DEFAULT_SOURCE ${CPPFLAGS}" +test -f config.h && EXTRA_CPPFLAGS="-DHAVE_CONFIG_H ${EXTRA_CPPFLAGS}" +test -n "$TITLE" && EXTRA_CPPFLAGS="-DASN_CONVERTER_TITLE=\"$TITLE\" ${EXTRA_CPPFLAGS}" set -x cat Makefile.am.sample \ - | sed -e "s/^CFLAGS += /CFLAGS += ${EXTRA_CFLAGS} /" \ + | sed -e "s/^CPPFLAGS += /CPPFLAGS += ${EXTRA_CPPFLAGS} /" \ | sed -e "s/^all: /all: ${ASN1PDU}.c /" \ | sed -e "s/progname/${PROGNAME}/" \ > Makefile.$$ @@ -62,7 +62,7 @@ set +x echo " ASN1MODULES=\"${ASN1MODULES}\" \\" echo " ASN1PDU=${ASN1PDU} \\" echo " PROGNAME=${PROGNAME} \\" - echo " CFLAGS=\"${CFLAGS}\" \\" + echo " CPPFLAGS=\"${CPPFLAGS}\" \\" echo " $0" echo echo 'check: ${TARGET} check-ber check-xer check-per' diff --git a/examples/sample.source.J2735/Makefile b/examples/sample.source.J2735/Makefile index a0c79c57..6f5f8326 100644 --- a/examples/sample.source.J2735/Makefile +++ b/examples/sample.source.J2735/Makefile @@ -984,7 +984,6 @@ ASN_MODULE_SOURCES+=INTEGER.c ASN_MODULE_SOURCES+=NativeEnumerated.c ASN_MODULE_HEADERS+=NativeInteger.h ASN_MODULE_SOURCES+=NativeInteger.c -ASN_MODULE_SOURCES+=NativeInteger_oer.c ASN_MODULE_HEADERS+=asn_SEQUENCE_OF.h ASN_MODULE_SOURCES+=asn_SEQUENCE_OF.c ASN_MODULE_HEADERS+=asn_SET_OF.h @@ -1048,19 +1047,19 @@ 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 = j2735-dump -CFLAGS += -DASN_CONVERTER_TITLE="J2735 DSRC decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DPDU=MessageFrame -I. +CPPFLAGS += -DASN_CONVERTER_TITLE="J2735 DSRC decoder" -DHAVE_CONFIG_H -DJUNKTEST -D_DEFAULT_SOURCE -DASN_DISABLE_OER_SUPPORT -DPDU=MessageFrame -I. OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o} all: MessageFrame.c $(TARGET) $(TARGET): ${OBJS} - $(CC) $(CFLAGS) -o $(TARGET) ${OBJS} $(LDFLAGS) $(LIBS) + $(CC) $(CPPFLAGS) -o $(TARGET) ${OBJS} $(LDFLAGS) $(LIBS) .SUFFIXES: .SUFFIXES: .c .o .c.o: - $(CC) $(CFLAGS) -o $@ -c $< + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< clean: rm -f $(TARGET) @@ -1083,7 +1082,7 @@ regen-makefile: ASN1MODULES="../j2735.asn1" \ ASN1PDU=MessageFrame \ PROGNAME=j2735-dump \ - CFLAGS="" \ + CPPFLAGS="" \ ../sample.makefile.regen check: ${TARGET} check-ber check-xer check-per |