Changeset 82e1c69 in rtems-libbsd


Ignore:
Timestamp:
Oct 11, 2012, 10:28:30 PM (7 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, afaeccc05a556f6aa25ba044a7e49d6aa634a59e, freebsd-9.3, master
Children:
44ffbd5
Parents:
0551981
Message:

Userspace Makefile: Clean up yacc/lex handling to avoid conflicts

Files:
2 added
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r0551981 r82e1c69  
    33copied
    44libbsd.html
     5freebsd-userspace/commands/sbin/route/keywords.h
     6freebsd-userspace/include/rpc/rpcb_prot.h
     7freebsd-userspace/lib/libipsec/y.tab.h
     8freebsd-userspace/lib/libc/net/y.tab.h
     9freebsd-userspace/lib/libipsec/policy_parse.c
     10freebsd-userspace/lib/libipsec/policy_token.c
     11freebsd-userspace/lib/libipsec/y.tab.h
    512rtemsbsd/freebsd/machine/rtems-bsd-config.h
    613rtemsbsd/avr/avr/in_cksum.c
     
    2633rtemsbsd/v850/v850/in_cksum.c
    2734rtemsbsd/v850/include/freebsd/machine/in_cksum.h
    28 freebsd-userspace/commands/sbin/route/keywords.h
    29 freebsd-userspace/include/rpc/rpcb_prot.h
    3035rtemsbsd/arm/include/freebsd/machine/legacyvar.h
    3136rtemsbsd/arm/include/freebsd/machine/pci_cfgreg.h
    3237rtemsbsd/avr/include/freebsd/machine/legacyvar.h
    33 rtemsbsd/avr/include/freebsd/machine/pci_cfgreg.h
     38rtemsbsd/avr/include/freebsd/machine/pci_cfgreg.hs
    3439rtemsbsd/bfin/include/freebsd/machine/legacyvar.h
    3540rtemsbsd/bfin/include/freebsd/machine/pci_cfgreg.h
  • freebsd-userspace/Makefile

    r0551981 r82e1c69  
    237237GEN_FILES += lib/libc/net/nsparser.c
    238238EXTRA_CLEAN = lib/libc/net/nsparser.i
     239EXTRA_CLEAN += lib/libc/net/y.tab.h
    239240
    240241# lib/libipsec
    241242GEN_FILES += lib/libipsec/policy_token.c
    242243GEN_FILES += lib/libipsec/policy_parse.c
    243 EXTRA_CLEAN += lib/libc/net/policy_parse.i
     244EXTRA_CLEAN += lib/libipsec/policy_parse.i
     245EXTRA_CLEAN += lib/libipsec/y.tab.h
    244246
    245247all: $(LIB)
     
    264266# lib/libc/net Yacc and lex files
    265267lib/libc/net/nslexer.c: lib/libc/net/nslexer.l
    266         ${LEX} -P _nsyy -t $^ | \
    267                 sed -e '/YY_BUF_SIZE/s/16384/1024/' >$@
     268        make -C lib/libc/net nslexer.c
    268269
    269270lib/libc/net/nsparser.c: lib/libc/net/nsparser.y
    270         yacc -d -p_nsyy -o lib/libc/net/nsparser.i $^
    271         cat lib/libc/net/nsparser.i | \
    272                 sed -e '/YY_BUF_SIZE/s/16384/1024/' >$@
    273         rm -f lib/libc/net/nsparser.i
     271        make -C lib/libc/net nsparser.c
    274272
    275273# libipsec Yacc and lex files
    276274lib/libipsec/policy_token.c: lib/libipsec/policy_token.l
    277         ${LEX} -P __libipsecyy -t $^ | \
    278                 sed -e '/YY_BUF_SIZE/s/16384/1024/' >$@
     275        make -C lib/libipsec policy_token.c
    279276
    280277lib/libipsec/policy_parse.c: lib/libipsec/policy_parse.y
    281         yacc -d -p __libipsecyy -o lib/libipsec/policy_parse.i $^
    282         cat lib/libipsec/policy_parse.i | \
    283                 sed -e '/YY_BUF_SIZE/s/16384/1024/' >$@
    284         rm -f lib/libipsec/policy_parse.i
     278        make -C lib/libipsec policy_parse.c
    285279
    286280install: $(LIB)
  • freebsd-userspace/lib/libipsec/policy_token.l

    r0551981 r82e1c69  
    5555
    5656#ifdef __rtems__
    57 #include "../../y.tab.h"
    5857/* XXX - Jennifer doesn't know where to get this from */
    5958YY_BUFFER_STATE yy_current_buffer;
    60 #else
     59#endif
     60
    6161#include "y.tab.h"
    62 #endif
    6362
    6463#define yylval __libipsecyylval /* XXX */
Note: See TracChangeset for help on using the changeset viewer.