commit 28c45cfec9ef67df23413ce26eba5931370ddcd8
parent b2f5fed58a592d8f4c14664ff9c1d9b4751a8219
Author: Daniel Bainton <dpb@driftaway.org>
Date: Thu, 22 May 2014 22:06:11 +0300
Clean up btpd mkfile
Diffstat:
3 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/btpd/btpd.mk b/btpd/btpd.mk
@@ -1,9 +1,10 @@
<../v.mk
-TARG = btp
+BIN = \
+ btpd/btpd \
+ cli/btinfo \
+ cli/btcli
LIB = libmisc.a libevloop.a
-CLEAN_FILES = btpd/btpd cli/btinfo cli/btcli
-#NOBIN
libmisc_a_OBJ = `{ ls misc/*.c | sed 's/.$/o/'}
libmisc_a_CFLAGS = -I`{ echo $(pwd)/misc }
@@ -13,15 +14,15 @@ libevloop_a_OBJ = evloop/timer.o evloop/timeheap.o evloop/epoll.o
libevloop_a_CFLAGS = -I`{ echo $(pwd)/evloop }
libevloop_a_LDFLAGS = -L`{ echo $(pwd)/evloop } -levloop
-btpd_OBJ = `{ ls btpd/*.c | sed 's/.$/o/'}
-btpd_CFLAGS = -I./btpd $libmisc_a_CFLAGS $libevloop_a_CFLAGS
-btpd_LDFLAGS = -L. $libmisc_a_LDFLAGS $libevloop_a_LDFLAGS
+btpd_btpd_OBJ = `{ ls btpd/*.c | sed 's/.$/o/'}
+btpd_btpd_CFLAGS = -I./btpd $libmisc_a_CFLAGS $libevloop_a_CFLAGS
+btpd_btpd_LDFLAGS = -L. $libmisc_a_LDFLAGS $libevloop_a_LDFLAGS
-btinfo_OBJ = cli/btinfo.o
-btinfo_CFLAGS = -I./cli $libmisc_a_CFLAGS
-btinfo_LDFLAGS = -L. $libmisc_a_LDFLAGS
+cli_btinfo_OBJ = cli/btinfo.o
+cli_btinfo_CFLAGS = -I./cli $libmisc_a_CFLAGS
+cli_btinfo_LDFLAGS = -L. $libmisc_a_LDFLAGS
-btcli_OBJ = \
+cli_btcli_OBJ = \
cli/btcli.o \
cli/add.o \
cli/del.o \
@@ -30,8 +31,8 @@ btcli_OBJ = \
cli/start.o \
cli/stop.o \
cli/stat.o
-btcli_CFLAGS = -I./cli $libmisc_a_CFLAGS
-btcli_LDFLAGS = -L. $libmisc_a_LDFLAGS
+cli_btcli_CFLAGS = -I./cli $libmisc_a_CFLAGS
+cli_btcli_LDFLAGS = -L. $libmisc_a_LDFLAGS
INSTALL_BIN = \
btpd/btpd \
@@ -53,17 +54,6 @@ DEPS = openssl
<$mkbuild/mk.default
-btpd:Q: $LIB $btpd_OBJ
- echo LD $target
- $LD $prereq $LDFLAGS $DEPS_LDFLAGS $LOCAL_LDFLAGS $btpd_LDFLAGS $LOCAL_BIN_LDFLAGS -o btpd/btpd
-
-btinfo:Q: $LIB $btinfo_OBJ
- echo LD $target
- $LD $prereq $LDFLAGS $DEPS_LDFLAGS $LOCAL_LDFLAGS $btinfo_LDFLAGS $LOCAL_BIN_LDFLAGS -o cli/btinfo
-
-btcli:Q: $LIB $btcli_OBJ
- echo LD $target
- $LD $prereq $LDFLAGS $DEPS_LDFLAGS $LOCAL_LDFLAGS $btcli_LDFLAGS $LOCAL_BIN_LDFLAGS -o cli/btcli
-
-btp: $LIB btpd btcli btinfo
-
+btpd_btpd: $LIB
+cli_btcli: $LIB
+cli_btinfo: $LIB
diff --git a/btpd/checksums b/btpd/checksums
@@ -1 +1 @@
-90d7574dec98649fb03973ca802f9ab3f0c43ac42761db2eb22146c985f2a43825ff6a5463d151950a8871ace9d73df2256eb926228ef4321b726c89ec3412f3 v0.16.tar.gz
+90d7574dec98649fb03973ca802f9ab3f0c43ac42761db2eb22146c985f2a43825ff6a5463d151950a8871ace9d73df2256eb926228ef4321b726c89ec3412f3 btpd-0.16.tar.gz
diff --git a/btpd/mkfile b/btpd/mkfile
@@ -2,5 +2,6 @@
<v.mk
src = btpd-$v
+pkgsrc = btpd-$v.tar.gz
url = https://github.com/btpd/btpd/archive/v$v.tar.gz
mkfile = ../btpd.mk
