1*4882a593Smuzhiyun[PATCH] Fix makefiles for out-of-tree build 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunSigned-off-by: Gary Bisson <gary.bisson@boundarydevices.com> 4*4882a593Smuzhiyun--- 5*4882a593Smuzhiyun debian/makefiles/adb.mk | 10 +++++----- 6*4882a593Smuzhiyun debian/makefiles/adbd.mk | 33 ++++++++++++++++----------------- 7*4882a593Smuzhiyun debian/makefiles/fastboot.mk | 17 +++++++++-------- 8*4882a593Smuzhiyun 3 files changed, 30 insertions(+), 30 deletions(-) 9*4882a593Smuzhiyun 10*4882a593Smuzhiyundiff --git a/debian/makefiles/adb.mk b/debian/makefiles/adb.mk 11*4882a593Smuzhiyunindex d9d4feb..654b9f1 100644 12*4882a593Smuzhiyun--- a/debian/makefiles/adb.mk 13*4882a593Smuzhiyun+++ b/debian/makefiles/adb.mk 14*4882a593Smuzhiyun@@ -1,5 +1,6 @@ 15*4882a593Smuzhiyun # Makefile for adb; from https://heiher.info/2227.html 16*4882a593Smuzhiyun 17*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/core/adb 18*4882a593Smuzhiyun SRCS+= adb.c 19*4882a593Smuzhiyun SRCS+= adb_client.c 20*4882a593Smuzhiyun SRCS+= adb_auth_host.c 21*4882a593Smuzhiyun@@ -17,7 +18,7 @@ SRCS+= usb_linux.c 22*4882a593Smuzhiyun SRCS+= usb_vendors.c 23*4882a593Smuzhiyun SRCS+= utils.c 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun-VPATH+= ../libcutils 26*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/core/libcutils 27*4882a593Smuzhiyun SRCS+= abort_socket.c 28*4882a593Smuzhiyun SRCS+= socket_inaddr_any_server.c 29*4882a593Smuzhiyun SRCS+= socket_local_client.c 30*4882a593Smuzhiyun@@ -28,7 +29,7 @@ SRCS+= socket_network_client.c 31*4882a593Smuzhiyun SRCS+= list.c 32*4882a593Smuzhiyun SRCS+= load_file.c 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun-VPATH+= ../libzipfile 35*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/core/libzipfile 36*4882a593Smuzhiyun SRCS+= centraldir.c 37*4882a593Smuzhiyun SRCS+= zipfile.c 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun@@ -37,9 +38,8 @@ CPPFLAGS+= -DADB_HOST=1 40*4882a593Smuzhiyun CPPFLAGS+= -DHAVE_FORKEXEC=1 41*4882a593Smuzhiyun CPPFLAGS+= -DHAVE_SYMLINKS 42*4882a593Smuzhiyun CPPFLAGS+= -DHAVE_TERMIO_H 43*4882a593Smuzhiyun-CPPFLAGS+= -I. 44*4882a593Smuzhiyun-CPPFLAGS+= -I../include 45*4882a593Smuzhiyun-CPPFLAGS+= -I../../../external/zlib 46*4882a593Smuzhiyun+CPPFLAGS+= -I$(SRCDIR)/core/adb 47*4882a593Smuzhiyun+CPPFLAGS+= -I$(SRCDIR)/core/include 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun LIBS+= -lc -lpthread -lz -lcrypto 50*4882a593Smuzhiyun 51*4882a593Smuzhiyundiff --git a/debian/makefiles/adbd.mk b/debian/makefiles/adbd.mk 52*4882a593Smuzhiyunindex 94d3a90..49dab8c 100644 53*4882a593Smuzhiyun--- a/debian/makefiles/adbd.mk 54*4882a593Smuzhiyun+++ b/debian/makefiles/adbd.mk 55*4882a593Smuzhiyun@@ -1,18 +1,6 @@ 56*4882a593Smuzhiyun # Makefile for adbd 57*4882a593Smuzhiyun 58*4882a593Smuzhiyun-VPATH+= ../libcutils 59*4882a593Smuzhiyun-SRCS+= abort_socket.c 60*4882a593Smuzhiyun-SRCS+= socket_inaddr_any_server.c 61*4882a593Smuzhiyun-SRCS+= socket_local_client.c 62*4882a593Smuzhiyun-SRCS+= socket_local_server.c 63*4882a593Smuzhiyun-SRCS+= socket_loopback_client.c 64*4882a593Smuzhiyun-SRCS+= socket_loopback_server.c 65*4882a593Smuzhiyun-SRCS+= socket_network_client.c 66*4882a593Smuzhiyun-SRCS+= list.c 67*4882a593Smuzhiyun-SRCS+= load_file.c 68*4882a593Smuzhiyun-SRCS+= android_reboot.c 69*4882a593Smuzhiyun- 70*4882a593Smuzhiyun-#VPATH+= ../adb 71*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/core/adbd 72*4882a593Smuzhiyun SRCS+= adb.c 73*4882a593Smuzhiyun SRCS+= backup_service.c 74*4882a593Smuzhiyun SRCS+= fdevent.c 75*4882a593Smuzhiyun@@ -31,7 +19,19 @@ SRCS+= log_service.c 76*4882a593Smuzhiyun SRCS+= utils.c 77*4882a593Smuzhiyun SRCS+= base64.c 78*4882a593Smuzhiyun 79*4882a593Smuzhiyun-VPATH+= ../libzipfile 80*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/core/libcutils 81*4882a593Smuzhiyun+SRCS+= abort_socket.c 82*4882a593Smuzhiyun+SRCS+= socket_inaddr_any_server.c 83*4882a593Smuzhiyun+SRCS+= socket_local_client.c 84*4882a593Smuzhiyun+SRCS+= socket_local_server.c 85*4882a593Smuzhiyun+SRCS+= socket_loopback_client.c 86*4882a593Smuzhiyun+SRCS+= socket_loopback_server.c 87*4882a593Smuzhiyun+SRCS+= socket_network_client.c 88*4882a593Smuzhiyun+SRCS+= list.c 89*4882a593Smuzhiyun+SRCS+= load_file.c 90*4882a593Smuzhiyun+SRCS+= android_reboot.c 91*4882a593Smuzhiyun+ 92*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/core/libzipfile 93*4882a593Smuzhiyun SRCS+= centraldir.c 94*4882a593Smuzhiyun SRCS+= zipfile.c 95*4882a593Smuzhiyun 96*4882a593Smuzhiyun@@ -40,10 +40,9 @@ CPPFLAGS+= -O2 -g -Wall -Wno-unused-parameter 97*4882a593Smuzhiyun CPPFLAGS+= -DADB_HOST=0 -DHAVE_FORKEXEC=1 -D_XOPEN_SOURCE -D_GNU_SOURCE -DALLOW_ADBD_ROOT=1 98*4882a593Smuzhiyun CPPFLAGS+= -DHAVE_SYMLINKS -DBOARD_ALWAYS_INSECURE 99*4882a593Smuzhiyun CPPFLAGS+= -DHAVE_TERMIO_H 100*4882a593Smuzhiyun-CPPFLAGS+= -I. 101*4882a593Smuzhiyun-CPPFLAGS+= -I../include 102*4882a593Smuzhiyun-CPPFLAGS+= -I../../../external/zlib 103*4882a593Smuzhiyun CPPFLAGS+= `pkg-config --cflags glib-2.0 gio-2.0` 104*4882a593Smuzhiyun+CPPFLAGS+= -I$(SRCDIR)/core/adbd 105*4882a593Smuzhiyun+CPPFLAGS+= -I$(SRCDIR)/core/include 106*4882a593Smuzhiyun 107*4882a593Smuzhiyun LIBS+= -lc -lpthread -lz -lcrypto -lcrypt `pkg-config --libs glib-2.0 gio-2.0` 108*4882a593Smuzhiyun 109*4882a593Smuzhiyundiff --git a/debian/makefiles/fastboot.mk b/debian/makefiles/fastboot.mk 110*4882a593Smuzhiyunindex 9e8b751..94a069b 100644 111*4882a593Smuzhiyun--- a/debian/makefiles/fastboot.mk 112*4882a593Smuzhiyun+++ b/debian/makefiles/fastboot.mk 113*4882a593Smuzhiyun@@ -1,5 +1,6 @@ 114*4882a593Smuzhiyun # Makefile for fastboot; from https://heiher.info/2227.html 115*4882a593Smuzhiyun 116*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/core/fastboot 117*4882a593Smuzhiyun SRCS+= bootimg.c 118*4882a593Smuzhiyun SRCS+= engine.c 119*4882a593Smuzhiyun SRCS+= fastboot.c 120*4882a593Smuzhiyun@@ -7,11 +8,11 @@ SRCS+= protocol.c 121*4882a593Smuzhiyun SRCS+= usb_linux.c 122*4882a593Smuzhiyun SRCS+= util_linux.c 123*4882a593Smuzhiyun 124*4882a593Smuzhiyun-VPATH+= ../libzipfile 125*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/core/libzipfile 126*4882a593Smuzhiyun SRCS+= centraldir.c 127*4882a593Smuzhiyun SRCS+= zipfile.c 128*4882a593Smuzhiyun 129*4882a593Smuzhiyun-VPATH+= ../libsparse 130*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/core/libsparse 131*4882a593Smuzhiyun SRCS+= backed_block.c 132*4882a593Smuzhiyun SRCS+= sparse_crc32.c 133*4882a593Smuzhiyun SRCS+= sparse.c 134*4882a593Smuzhiyun@@ -19,7 +20,7 @@ SRCS+= sparse_read.c 135*4882a593Smuzhiyun SRCS+= sparse_err.c 136*4882a593Smuzhiyun SRCS+= output_file.c 137*4882a593Smuzhiyun 138*4882a593Smuzhiyun-VPATH+= ../../extras/ext4_utils/ 139*4882a593Smuzhiyun+VPATH+= $(SRCDIR)/extras/ext4_utils/ 140*4882a593Smuzhiyun SRCS+= make_ext4fs.c 141*4882a593Smuzhiyun SRCS+= crc16.c 142*4882a593Smuzhiyun SRCS+= ext4_utils.c 143*4882a593Smuzhiyun@@ -31,11 +32,11 @@ SRCS+= extent.c 144*4882a593Smuzhiyun SRCS+= wipe.c 145*4882a593Smuzhiyun SRCS+= sha1.c 146*4882a593Smuzhiyun 147*4882a593Smuzhiyun-CPPFLAGS+= -I. 148*4882a593Smuzhiyun-CPPFLAGS+= -I../include 149*4882a593Smuzhiyun-CPPFLAGS+= -I../mkbootimg 150*4882a593Smuzhiyun-CPPFLAGS+= -I../../extras/ext4_utils/ 151*4882a593Smuzhiyun-CPPFLAGS+= -I../libsparse/include/ 152*4882a593Smuzhiyun+CPPFLAGS+= -I$(SRCDIR)/core/fastboot 153*4882a593Smuzhiyun+CPPFLAGS+= -I$(SRCDIR)/core/include 154*4882a593Smuzhiyun+CPPFLAGS+= -I$(SRCDIR)/core/mkbootimg 155*4882a593Smuzhiyun+CPPFLAGS+= -I$(SRCDIR)/extras/ext4_utils/ 156*4882a593Smuzhiyun+CPPFLAGS+= -I$(SRCDIR)/core/libsparse/include/ 157*4882a593Smuzhiyun 158*4882a593Smuzhiyun LIBS+= -lz -lselinux 159*4882a593Smuzhiyun 160*4882a593Smuzhiyun-- 161*4882a593Smuzhiyun2.5.1 162*4882a593Smuzhiyun 163