diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-09-23 16:03:27 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-09-23 16:03:27 -0700 |
| commit | 5aefa0fdfcf45717c133641b7e4df8070ed025e3 (patch) | |
| tree | 7eaf97986d62892368f8d14cd48cfc45dddf7923 /tools | |
| parent | e56809a09aeffa2ccaec4582f6ca2fc0d4b4949e (diff) | |
| parent | c431a66df3df4cff82bfa2d2b2c7b16895a7efd6 (diff) | |
| download | uhd-5aefa0fdfcf45717c133641b7e4df8070ed025e3.tar.gz uhd-5aefa0fdfcf45717c133641b7e4df8070ed025e3.tar.bz2 uhd-5aefa0fdfcf45717c133641b7e4df8070ed025e3.zip | |
Merge branch 'maint'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/chdr-dissector/cmake/Modules/FindWireshark.cmake | 2 | ||||
| -rw-r--r-- | tools/uhd_dump/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake b/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake index 59497da16..276201245 100644 --- a/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake +++ b/tools/chdr-dissector/cmake/Modules/FindWireshark.cmake @@ -16,7 +16,7 @@ # wireshark does not install its library with pkg-config information, # so we need to manually find the libraries and headers -FIND_PATH( WIRESHARK_INCLUDE_DIRS epan/column_info.h PATH_SUFFIXES wireshark ) +FIND_PATH( WIRESHARK_INCLUDE_DIRS epan/column.h PATH_SUFFIXES wireshark ) FIND_LIBRARY( WIRESHARK_LIBRARIES wireshark ) # Report results diff --git a/tools/uhd_dump/Makefile b/tools/uhd_dump/Makefile index b793776d4..0494767bb 100644 --- a/tools/uhd_dump/Makefile +++ b/tools/uhd_dump/Makefile @@ -20,7 +20,7 @@ OBJECTS = uhd_dump.o CFLAGS = -g -O0 -Wall -LDFLAGS = -lpcap -lm +LIBS = -lpcap -lm CC = cc @@ -28,7 +28,7 @@ CC = cc all: $(BINARIES) chdr_log: uhd_dump.o chdr_log.o $(INCLUDES) - $(CC) $(CFLAGS) -o $@ uhd_dump.o chdr_log.o $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ uhd_dump.o chdr_log.o $(LIBS) $(LDFLAGS) |