diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2023-07-13 01:17:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-13 01:17:58 +0000 |
| commit | e392a02c2631ffbab8efb31eda876b80a743cf3e (patch) | |
| tree | 459101553d2b7814467ff205890774b31912033c /Makefile.in | |
| parent | ecbde7e0a073a51a5b6d3403d36b265b37eaf444 (diff) | |
| parent | df81e44a42d3d7dec61edbc3e0342662733131e8 (diff) | |
| download | tcpdump-e392a02c2631ffbab8efb31eda876b80a743cf3e.tar.gz | |
Merge "Upgrade tcpdump to tcpdump-4.99.4" into main am: d231da0df5 am: 79017393c7 am: 86a2c2f7a5 am: df81e44a42
Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2655820
Change-Id: Ia74728e9efcc1d26a7703de898437757301c5143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index ad513ec7..1bdeb514 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 -# The Regents of the University of California. All rights reserved. +# The Regents of the University of California. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that: (1) source code distributions @@ -327,9 +327,9 @@ TAGHDR = \ /usr/include/netinet/in.h TAGFILES = $(SRC) $(HDR) $(TAGHDR) $(LIBNETDISSECT_SRC) \ - print-pflog.c print-smb.c smbutil.c + print-smb.c smbutil.c -CLEANFILES = $(PROG) $(OBJ) $(LIBNETDISSECT_OBJ) +CLEANFILES = $(PROG) $(OBJ) $(LIBNETDISSECT_OBJ) print-smb.o smbutil.o EXTRA_DIST = \ CHANGES \ @@ -378,7 +378,6 @@ EXTRA_DIST = \ missing/strsep.c \ mkdep \ packetdat.awk \ - print-pflog.c \ print-smb.c \ send-ack.awk \ smbutil.c \ @@ -524,6 +523,11 @@ whitespacecheck: echo 'Error: Trailing tabs(s).'; \ exit 1; \ fi + @# space(s) before tab(s)? + @if git grep -I -n '[ ][ ]' $$(git ls-files|grep -v '^tests/'); then \ + echo 'Error: space(s) before tab(s).'; \ + exit 1; \ + fi testlist: echo $(TEST_DIST) |