package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch

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