From 0d0f1085dc41c2090bb8716833a8e5bc214f284a Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Wed, 19 Mar 2014 21:28:17 +0100 Subject: [PATCH] wireshark provides a pkg-config file now --- Makefile | 7 ++++--- config.mk | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ffe9f0c..4ea4617 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ include config.mk -CFLAGS +=-I${WIRESHARKDIR} -DHAVE_STDARG_H -DHAVE_CONFIG_H -g -Wall -Wno-unused +CFLAGS += -DHAVE_CONFIG_H -g -Wall -Wno-unused +PLUGINDIR := `pkg-config --variable=plugindir wireshark` SOURCES := $(wildcard src/*.c) OBJECTS := $(patsubst %.c, %.o, $(SOURCES)) @@ -8,7 +9,7 @@ all: isi.so %.o: %.c @echo "[CC] $<" - @$(CC) -o $@ $(CFLAGS) `pkg-config --cflags glib-2.0` -c -fPIC $< + @$(CC) -o $@ $(CFLAGS) `pkg-config --cflags glib-2.0 wireshark` -c -fPIC $< isi.so: $(OBJECTS) @echo "[LD] $@" @@ -18,6 +19,6 @@ clean: @rm -f isi.so $(OBJECTS) install: isi.so - install -m 644 isi.so $(DESTDIR)${PREFIX}/${PLUGINDIR} + install -m 644 isi.so $(DESTDIR)/${PLUGINDIR} .PHONEY: all clean install diff --git a/config.mk b/config.mk index 3d2fc43..73bb091 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,2 @@ #use this to compile with USB support #CFLAGS?=-DISI_USB -PREFIX?=/usr -PLUGINDIR?=lib/x86_64-linux-gnu/wireshark/libwireshark3/plugins -WIRESHARKDIR?=/usr/include/wireshark