diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-11-22 06:02:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-11-22 06:02:49 +0000 |
| commit | bd976ae6c06b2111bd82df16b77739731dc17402 (patch) | |
| tree | 406d65d00129abb45868150687f267a139bbf670 /Makefile.am | |
| parent | b9e8e95ffe9f352cde5847d458081826523cf46f (diff) | |
On UN*X, if an interface has a description, use it as the "friendly
name". If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.
If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.
Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.
svn path=/trunk/; revision=46131
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index dc6b2fd4b0..9e4c452df8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -271,7 +271,9 @@ wimaxasncp_DATA = \ wimaxasncp/dictionary.xml \ wimaxasncp/dictionary.dtd -PLATFORM_SRC = capture-pcap-util-unix.c +PLATFORM_SRC = \ + capture-pcap-util-unix.c \ + capture_unix_ifnames.c if HAVE_PLUGINS -include plugins/Custom.make @@ -347,6 +349,7 @@ wireshark_LDADD = \ @ADNS_LIBS@ \ @KRB5_LIBS@ \ @APPLICATIONSERVICES_FRAMEWORKS@ \ + @SYSTEMCONFIGURATION_FRAMEWORKS@ \ @COREFOUNDATION_FRAMEWORKS@ \ @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @@ -381,6 +384,7 @@ tshark_LDADD = \ @C_ARES_LIBS@ \ @ADNS_LIBS@ \ @KRB5_LIBS@ \ + @SYSTEMCONFIGURATION_FRAMEWORKS@ \ @COREFOUNDATION_FRAMEWORKS@ \ @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @@ -409,6 +413,7 @@ rawshark_LDADD = \ @C_ARES_LIBS@ \ @ADNS_LIBS@ \ @KRB5_LIBS@ \ + @SYSTEMCONFIGURATION_FRAMEWORKS@ \ @COREFOUNDATION_FRAMEWORKS@ \ @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @@ -496,6 +501,7 @@ dumpcap_LDADD = \ @PCAP_LIBS@ \ @SOCKET_LIBS@ \ @NSL_LIBS@ \ + @SYSTEMCONFIGURATION_FRAMEWORKS@ \ @COREFOUNDATION_FRAMEWORKS@ \ @LIBCAP_LIBS@ dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS) |