|
@@ -1,15 +1,13 @@
|
|
|
--- a/Makefile.in
|
|
--- a/Makefile.in
|
|
|
+++ b/Makefile.in
|
|
+++ b/Makefile.in
|
|
|
-@@ -70,6 +70,82 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
|
|
|
|
|
- @rm -f $@
|
|
|
|
|
- $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
|
|
|
|
|
|
|
+@@ -72,6 +72,80 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
|
|
|
|
|
+
|
|
|
|
|
+ CSRC = setsignal.c tcpdump.c
|
|
|
|
|
|
|
|
+ifdef TCPDUMP_MINI
|
|
+ifdef TCPDUMP_MINI
|
|
|
+
|
|
+
|
|
|
-+CSRC=\
|
|
|
|
|
-+ tcpdump.c \
|
|
|
|
|
|
|
++LIBNETDISSECT_SRC=\
|
|
|
+ netdissect.c \
|
|
+ netdissect.c \
|
|
|
-+ setsignal.c \
|
|
|
|
|
+ addrtoname.c \
|
|
+ addrtoname.c \
|
|
|
+ addrtostr.c \
|
|
+ addrtostr.c \
|
|
|
+ af.c \
|
|
+ af.c \
|
|
@@ -80,10 +78,10 @@
|
|
|
+
|
|
+
|
|
|
+else
|
|
+else
|
|
|
+
|
|
+
|
|
|
- CSRC = setsignal.c tcpdump.c
|
|
|
|
|
-
|
|
|
|
|
LIBNETDISSECT_SRC=\
|
|
LIBNETDISSECT_SRC=\
|
|
|
-@@ -237,12 +313,16 @@ LIBNETDISSECT_SRC=\
|
|
|
|
|
|
|
+ addrtoname.c \
|
|
|
|
|
+ addrtostr.c \
|
|
|
|
|
+@@ -237,6 +311,8 @@ LIBNETDISSECT_SRC=\
|
|
|
strtoaddr.c \
|
|
strtoaddr.c \
|
|
|
util-print.c
|
|
util-print.c
|
|
|
|
|
|
|
@@ -92,27 +90,6 @@
|
|
|
LOCALSRC = @LOCALSRC@
|
|
LOCALSRC = @LOCALSRC@
|
|
|
GENSRC = version.c
|
|
GENSRC = version.c
|
|
|
LIBOBJS = @LIBOBJS@
|
|
LIBOBJS = @LIBOBJS@
|
|
|
-
|
|
|
|
|
-+ifndef TCPDUMP_MINI
|
|
|
|
|
- LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) ${LOCALSRC:.c=.o} ${LIBOBJS}
|
|
|
|
|
- LIBNETDISSECT=libnetdissect.a
|
|
|
|
|
-+endif
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- SRC = $(CSRC) $(GENSRC) $(LOCALSRC) $(LIBNETDISSECT_SRC)
|
|
|
|
|
-@@ -373,10 +453,12 @@ $(PROG): $(OBJ) @V_PCAPDEP@
|
|
|
|
|
- @rm -f $@
|
|
|
|
|
- $(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
|
|
|
|
|
-
|
|
|
|
|
-+ifndef TCPDUMP_MINI
|
|
|
|
|
- $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
|
|
|
|
|
- @rm -f $@
|
|
|
|
|
- $(AR) cr $@ $(LIBNETDISSECT_OBJ)
|
|
|
|
|
- $(RANLIB) $@
|
|
|
|
|
-+endif
|
|
|
|
|
-
|
|
|
|
|
- datalinks.o: $(srcdir)/missing/datalinks.c
|
|
|
|
|
- $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c
|
|
|
|
|
--- a/addrtoname.c
|
|
--- a/addrtoname.c
|
|
|
+++ b/addrtoname.c
|
|
+++ b/addrtoname.c
|
|
|
@@ -566,8 +566,10 @@ linkaddr_string(netdissect_options *ndo,
|
|
@@ -566,8 +566,10 @@ linkaddr_string(netdissect_options *ndo,
|