Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Jun 2015 17:14:00 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r390135 - in head/devel/android-tools-adb: . files
Message-ID:  <201506191714.t5JHE0ij044101@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jun 19 17:13:59 2015
New Revision: 390135
URL: https://svnweb.freebsd.org/changeset/ports/390135

Log:
  devel/android-tools-adb: convert to BSD-style Makefile
  
  - Supports building with multiple jobs
  - No longer depends on devel/gmake
  
  Differential Revision:	https://reviews.freebsd.org/D2862
  Obtained from:	devel/android-tools-fastboot (based on)
  Approved by:	kevlo (maintainer)

Modified:
  head/devel/android-tools-adb/Makefile   (contents, props changed)
  head/devel/android-tools-adb/files/Makefile   (contents, props changed)

Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile	Fri Jun 19 16:50:54 2015	(r390134)
+++ head/devel/android-tools-adb/Makefile	Fri Jun 19 17:13:59 2015	(r390135)
@@ -14,10 +14,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	android
 GH_PROJECT=	platform_system_core
 
-USES=		gmake
+USES=		uidfix
 WRKSRC_SUBDIR=	adb
 MAKEFILE=	${FILESDIR}/Makefile
-MAKE_JOBS_UNSAFE=	yes
+MAKE_ENV=	BINDIR="${PREFIX}/bin"
 
 PLIST_FILES=	bin/adb
 

Modified: head/devel/android-tools-adb/files/Makefile
==============================================================================
--- head/devel/android-tools-adb/files/Makefile	Fri Jun 19 16:50:54 2015	(r390134)
+++ head/devel/android-tools-adb/files/Makefile	Fri Jun 19 17:13:59 2015	(r390135)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PROG=	adb
+NO_MAN=
+BINDIR?=/usr/bin
+
 SRCS+= adb.c
 SRCS+= adb_client.c
 SRCS+= adb_auth_host.c
@@ -16,7 +20,7 @@ SRCS+= transport_usb.c
 SRCS+= usb_libusb.c
 SRCS+= usb_vendors.c
 
-VPATH+= ../libcutils
+.PATH: ${.CURDIR}/../libcutils
 SRCS+= socket_inaddr_any_server.c
 SRCS+= socket_local_client.c
 SRCS+= socket_local_server.c
@@ -25,31 +29,20 @@ SRCS+= socket_loopback_server.c
 SRCS+= socket_network_client.c
 SRCS+= load_file.c
 
-VPATH+= ../libzipfile
+.PATH: ${.CURDIR}/../libzipfile
 SRCS+= centraldir.c
 SRCS+= zipfile.c
 
+CFLAGS+= -DADB_HOST=1
+CFLAGS+= -DHAVE_FORKEXEC=1
+CFLAGS+= -DHAVE_SYMLINKS
+CFLAGS+= -DHAVE_TERMIO_H
+CFLAGS+= -DHAVE_SYS_SOCKET_H
+CFLAGS+= -D_FILE_OFFSET_BITS=64
+CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR}/../include
 
-CPPFLAGS+= -DADB_HOST=1
-CPPFLAGS+= -DHAVE_FORKEXEC=1
-CPPFLAGS+= -DHAVE_SYMLINKS
-CPPFLAGS+= -DHAVE_TERMIO_H
-CPPFLAGS+= -DHAVE_SYS_SOCKET_H
-CPPFLAGS+= -D_FILE_OFFSET_BITS=64
-CPPFLAGS+= -I.
-CPPFLAGS+= -I../include
-
-LIBS+= -lc -pthread -lz -lcrypto -lusb
-
-OBJS= $(SRCS:.c=.o)
-
-all: adb
-
-adb: $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
-
-install: adb
-	${BSD_INSTALL_PROGRAM} adb ${DESTDIR}${PREFIX}/bin/
+LDADD+= -lcrypto -lpthread -lusb -lz
+DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
 
-clean:
-	rm -rf $(OBJS) adb
+.include <bsd.prog.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506191714.t5JHE0ij044101>