diff options
| author | Denis Ovsienko <denis@ovsienko.info> | 2023-03-26 20:04:36 +0100 |
|---|---|---|
| committer | Denis Ovsienko <denis@ovsienko.info> | 2023-03-26 20:08:42 +0100 |
| commit | bbb12dc7568694271e33e658a3d99e579e5df08c (patch) | |
| tree | 859c386f61bfabace571f6162b4571d5ad6dccc4 | |
| parent | 15d011454e8c8bd37006c497828e59db3a23e98c (diff) | |
| download | libpcap-bbb12dc7568694271e33e658a3d99e579e5df08c.tar.gz | |
Finalize moving of bpf_filter.c. [skip ci]
As Blake Easley points it out in GitHub bug report #1166, before commit
08a5870 in 2018 bpf_filter.c was a symlink to bpf/net/bpf_filter.c, but
now it is a regular file, so it is wrong to list it in .gitignore. Fix
that and reflect the file path change in DOS makefiles.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | msdos/makefile.dj | 4 | ||||
| -rw-r--r-- | msdos/makefile.wc | 6 |
4 files changed, 6 insertions, 6 deletions
@@ -2,7 +2,6 @@ /Makefile *~ /*.o -/bpf_filter.c CMakeCache.txt cmake_install.cmake CMakeFiles/ @@ -5,6 +5,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group fixed-width integer types, in rpcap code. Remove an always-false pointer test from snf_read(). Clean up DECnet address handling. + Finalize moving of bpf_filter.c. (GH #1166) Link-layer types: Add LINKTYPE_ETW/DLT_ETW. Add LINKTYPE_NETANALYZER_NG/DLT_NETANALYZER_NG (pull request diff --git a/msdos/makefile.dj b/msdos/makefile.dj index 9e41064e..7c65cc06 100644 --- a/msdos/makefile.dj +++ b/msdos/makefile.dj @@ -9,7 +9,7 @@ # Note: you should do a "set LFN=y" before running this makefile. # -VPATH = missing msdos bpf/net +VPATH = missing msdos PREREQUISITES = scanner.c grammar.c tokdefs.h version.h msdos/pkt_stub.inc @@ -22,7 +22,7 @@ CFLAGS += -DDEBUG -DNDIS_DEBUG -DHAVE_LIMITS_H -DHAVE_STRERROR -DHAVE_SNPRINTF - CFLAGS += -Dyylval=pcap_lval # -DBDEBUG -DNDEBUG -SOURCES = grammar.c scanner.c bpf/net/bpf_filter.c bpf_image.c bpf_dump.c \ +SOURCES = grammar.c scanner.c bpf_filter.c bpf_image.c bpf_dump.c \ etherent.c gencode.c nametoaddr.c pcap-common.c pcap-dos.c optimize.c \ savefile.c pcap.c sf-pcap.c sf-pcapng.c \ msdos/pktdrvr.c msdos/ndis2.c diff --git a/msdos/makefile.wc b/msdos/makefile.wc index 02460120..a0aa71fc 100644 --- a/msdos/makefile.wc +++ b/msdos/makefile.wc @@ -52,8 +52,8 @@ $(OBJDIR)\pktdrvr.obj: msdos\pkt_stub.inc msdos\pktdrvr.c & pcap-dos.h pcap-int.h pcap.h msdos\pktdrvr.h *$(CC) $(CFLAGS) msdos\pktdrvr.c -fo=$@ -$(OBJDIR)\bpf_filter.obj: bpf\net\bpf_filter.c - *$(CC) $(CFLAGS) bpf\net\bpf_filter.c -fo=$@ +$(OBJDIR)\bpf_filter.obj: bpf_filter.c + *$(CC) $(CFLAGS) bpf_filter.c -fo=$@ $(OBJDIR)\ndis2.obj: msdos\ndis2.c *$(CC) $(CFLAGS) msdos\ndis2.c -fo=$@ @@ -94,7 +94,7 @@ clean realclean vclean: .SYMBOLIC # # dependencies # -$(OBJDIR)\bpf_filter.obj: bpf\net\bpf_filter.c pcap-int.h pcap.h pcap-bpf.h +$(OBJDIR)\bpf_filter.obj: bpf_filter.c pcap-int.h pcap.h pcap-bpf.h $(OBJDIR)\bpf_imag.obj: bpf_imag.c pcap-int.h pcap.h pcap-bpf.h |