kismet-ubertooth: cleanup

This commit is contained in:
Zero_Chaos 2011-07-16 21:00:07 +00:00
parent d5faa25d5e
commit 51d3cb45eb
3 changed files with 1 additions and 48 deletions

View file

@ -1,2 +1 @@
AUX makefile.patch 1779 RMD160 cdf685db2a6de4bbdc4dd501f70f990233010860 SHA1 d08b7085ceeb52916dceb23fc08599d03f5b573a SHA256 8bda636ae8e2e24d07d34bb63aad8f031777f217147f8afbfb095ed04064c653
EBUILD kismet-ubertooth-9999.ebuild 866 RMD160 ec592a02a4ffe31985a256f067c6e417390229aa SHA1 2c820ccaa4880f3b73ded06c2b1e776990fe9f4c SHA256 c65a7fab75525e92c68079848a453bca7882516050d19f91308a571126b25cf2
EBUILD kismet-ubertooth-9999.ebuild 807 RMD160 64a01555d62430c524b33303e8f95f9f45afa6cf SHA1 cfc2ae1062b8458584b223a34ef7049549bdc102 SHA256 a96db3eb572ca32650c4d8637f0636b6021b2e1f9a251d14b380460bf8e7b2be

View file

@ -1,42 +0,0 @@
diff -Naur trunk-orig/host/kismet/plugin-ubertooth/Makefile trunk/host/kismet/plugin-ubertooth/Makefile
--- trunk-orig/host/kismet/plugin-ubertooth/Makefile 2011-05-31 20:08:49.000000000 -0400
+++ trunk/host/kismet/plugin-ubertooth/Makefile 2011-05-31 20:29:49.000000000 -0400
@@ -2,6 +2,7 @@
KIS_INC_DIR ?= $(KIS_SRC_DIR)
RXTX_SRC_DIR ?= ../../bluetooth_rxtx
RXTX_INC_DIR ?= $(RXTX_SRC_DIR)
+LIBDIR ?= /lib
include $(KIS_SRC_DIR)/Makefile.inc
@@ -11,6 +12,7 @@
PLUGINLDFLAGS ?= $(LDFLAGS)
PLUGINLDFLAGS += -shared -rdynamic
LIBS += -lstdc++ -lusb-1.0 -lpthread -lbtbb
+CFLAGS ?= $(CFLAGS) $(CPPFLAGS)
CFLAGS += -I/usr/include -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
SRVOBJS = packetsource_ubertooth.o packet_btbb.o packet_btbb_types.o \
@@ -23,16 +25,16 @@
all: $(SRVOUT) $(CLIOUT)
$(CLIOUT): $(CLIOBJS)
- $(LD) $(PLUGINLDFLAGS) $(CLIOBJS) -o $(CLIOUT) $(LIBS)
+ $(CC) $(PLUGINLDFLAGS) $(CFLAGS) $(CLIOBJS) -o $(CLIOUT) $(LIBS)
$(SRVOUT): $(SRVOBJS)
- $(LD) $(PLUGINLDFLAGS) $(SRVOBJS) -o $(SRVOUT) $(LIBS)
+ $(CC) $(PLUGINLDFLAGS) $(CFLAGS) $(SRVOBJS) -o $(SRVOUT) $(LIBS)
install: $(SRVOUT) $(CLIOUT)
- mkdir -p $(DESTDIR)$(prefix)/lib/kismet/
- install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/lib/kismet/$(SRVOUT)
- mkdir -p $(DESTDIR)$(prefix)/lib/kismet_client/
- install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(CLIOUT) $(DESTDIR)$(prefix)/lib/kismet_client/$(CLIOUT)
+ mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/
+ install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/$(SRVOUT)
+ mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet_client/
+ install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(CLIOUT) $(DESTDIR)$(prefix)/$(LIBDIR)/kismet_client/$(CLIOUT)
userinstall: $(SRVOUT) $(CLIOUT)

View file

@ -22,10 +22,6 @@ RDEPEND=">=net-wireless/kismet-2011.03.2-r1 \
ESVN_REPO_URI="https://ubertooth.svn.sourceforge.net/svnroot/ubertooth/trunk/host"
#src_prepare() {
# epatch "${FILESDIR}/makefile.patch"
#}
src_compile() {
cd "${WORKDIR}/${P}/kismet/plugin-ubertooth"
emake KIS_SRC_DIR="/usr/include/kismet/"