]> The Tcpdump Group git mirrors - libpcap/commitdiff
Merge pull request #360 from bonsaiviking/scanner-lex-top
authorMichael Richardson <[email protected]>
Sun, 15 Feb 2015 17:40:51 +0000 (12:40 -0500)
committerMichael Richardson <[email protected]>
Sun, 15 Feb 2015 17:40:51 +0000 (12:40 -0500)
Move the inclusion of config.h to the top of scanner.c

1  2 
Makefile.in

diff --combined Makefile.in
index 749345b263d50624522de89ab31310a2ab29251f,f5117c28483b5e05518a5c0b0a4923e3b8cd936f..b1866e583f3edda1ff2f637852384797993a79bf
@@@ -291,6 -291,7 +291,6 @@@ EXTRA_DIST = 
        msdos/pktdrvr.h \
        msdos/readme.dos \
        org.tcpdump.chmod_bpf.plist \
 -      packaging/pcap.spec.in \
        pcap-bpf.c \
        pcap-bt-linux.c \
        pcap-bt-linux.h \
@@@ -442,8 -443,10 +442,10 @@@ libpcap.shareda: $(OBJ
  libpcap.none:
  
  scanner.c: $(srcdir)/scanner.l
-       @rm -f $@
+       @rm -f $@ [email protected]
        $(srcdir)/runlex.sh $(LEX) -o$@ $<
+       mv $@ [email protected]
+       cat [email protected] [email protected] > $@
  
  scanner.o: scanner.c tokdefs.h
        $(CC) $(FULL_CFLAGS) -c scanner.c
@@@ -730,6 -733,10 +732,6 @@@ distclean: clea
  tags: $(TAGFILES)
        ctags -wtd $(TAGFILES)
  
 -packaging/pcap.spec: packaging/pcap.spec.in VERSION
 -      RPMVERSION=`cat VERSION | sed s/-.*//g`; \
 -              sed -e s/@VERSION@/$$RPMVERSION/ -e s/@NAME@/libpcap-`cat VERSION`/ $<   > $@
 -
  releasetar:
        @cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
           mkdir $$name; \