Remove Makefile

Remove the Makefile and all the references in the README
and CI scripts.

Signed-off-by: Neil Armstrong <[email protected]>

Author: superna9999

.github/workflows/ci.yml

@@ -48,31 +48,32 @@ jobs:
           - ubuntu:jammy
           - ubuntu:focal
           - ubuntu:bionic
-          - ubuntu:xenial
+          # Meson version on Ubuntu Xenial is really too old
+          #- ubuntu:xenial
         cross_compile: [""]
         variant: [""]
         include:
           # Debian 32-bit builds
           - container: "debian:testing"
             arch: i386
             family: x86
-            compiler: gcc -m32
+            compiler: gcc
             cross_compile: i686-linux-gnu
             pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
             variant: i386
 
           - container: "debian:stable"
             arch: i386
             family: x86
-            compiler: gcc -m32
+            compiler: gcc
             cross_compile: i686-linux-gnu
             pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
             variant: i386
 
           - container: "debian:bookworm"
             arch: i386
             family: x86
-            compiler: gcc -m32
+            compiler: gcc
             cross_compile: i686-linux-gnu
             pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
             variant: i386
@@ -203,13 +204,13 @@ jobs:
 
     # i386 build on x86_64 only requires passing -m32 to CFLAGS & LDFLAGS
     - name: Meson init for i386
-      if: ${{ matrix.container != 'ubuntu:xenial' && matrix.variant == 'i386' }}
+      if: ${{ matrix.variant == 'i386' }}
       run: |
         mkdir build
         CFLAGS="-m32" LDFLAGS="-m32" meson setup . build
 
     - name: Meson init with cross compile
-      if: ${{ matrix.container != 'ubuntu:xenial' && matrix.variant == 'cross-compile' }}
+      if: ${{ matrix.variant == 'cross-compile' }}
       run: |
         # Generate cross compile file (see https://mesonbuild.com/Cross-compilation.html#cross-compilation)
         echo "[binaries]" > cross.txt
@@ -229,18 +230,13 @@ jobs:
         meson setup --cross-file cross.txt . build
 
     - name: Meson init
-      if: ${{ matrix.container != 'ubuntu:xenial' && matrix.variant == '' }}
+      if: ${{ matrix.variant == '' }}
       run: |
         mkdir build
-        # Ubuntu Xenial Meson version doesn't support meson setup, so use old way by default
-        meson . build
-
-    - name: Ninja build
-      if: ${{ matrix.container != 'ubuntu:xenial' }}
-      run: ninja -C build
+        meson setup . build
 
     - name: Compile
-      run: make -j$(nproc)
+      run: ninja -C build
 
     - name: Install
-      run: make install
+      run: ninja -C build install

Makefile

@@ -3,18 +3,15 @@ The CDBA control tool is used for remotely booting images on development boards
 attached using a CDB Assist [https://github.com/sonyxperiadev/CDB-Assist] or Conmux.
 
 = Dependencies
-sudo apt-get install libudev-dev libyaml-dev libftdi1-dev for debian systems
-dnf install systemd-devel libyaml-devel libftdi1-devel for fedora systems
+sudo apt-get install libudev-dev libyaml-dev libftdi1-dev pkg-config meson for debian systems
+dnf install systemd-devel libyaml-devel libftdi1-devel pkg-config meson for fedora systems
 
 = Device side
 On the host with the CDB Assist or Conmux attached the "cdba-server" executable is run
 from sandbox/cdba/cdba-server. Available devices are read from $HOME/.cdba
 
 = Build instructions
 
-Either use make directly:
-# make
-or use the Meson build system:
 # meson . build
 # ninja -C build
 

README

@@ -20,7 +20,6 @@ pacman -Syu --noconfirm \
 	libftdi-compat \
 	libyaml \
 	systemd-libs \
-	make \
 	pkgconf \
 	meson \
 	$PKGS_CC

ci/archlinux.sh

@@ -32,7 +32,6 @@ apt install -y --no-install-recommends \
 	libftdi-dev \
 	libudev-dev \
 	libyaml-dev \
-	make \
 	meson \
 	$PKGS_CC
 

ci/debian.sh

@@ -20,7 +20,6 @@ dnf -y install \
 	libftdi-devel \
 	libudev-devel \
 	libyaml-devel \
-	make \
 	meson \
 	$PKGS_CC