From 8f4501b009a26bc2fc5dfdebf76052b1acd57d34 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Tue, 2 Sep 2014 11:37:55 +0200 Subject: uhd_dump: use LIBS instead of LDFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows distro override for LDFLAGS and doesn't break the build process. Signed-off-by: Jaroslav Škarvada --- tools/uhd_dump/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') 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) -- cgit v1.2.3 From 4547d1c74a6c875057f23f8ea77033b9cd191539 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Tue, 2 Sep 2014 11:58:24 +0200 Subject: chdr-dissector: fix wireshark-1.12 detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- tools/chdr-dissector/cmake/Modules/FindWireshark.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') 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 -- cgit v1.2.3