[gnome-power-manager] Remove automake build system



commit 08a9c485be59991a1eb43b255d06b7fab4240db8
Author: Richard Hughes <richard hughsie com>
Date:   Tue Apr 4 13:59:01 2017 +0100

    Remove automake build system

 Makefile.am                         |   63 -----------
 autogen.sh                          |   20 ----
 configure                           |  143 +++++++++++++++++++++++++
 configure.ac                        |  154 ---------------------------
 contrib/gnome-power-manager.spec.in |    8 +-
 data/Makefile.am                    |   24 ----
 data/appdata/Makefile.am            |   10 --
 git.mk                              |  200 -----------------------------------
 m4/.gitignore                       |    1 -
 man/Makefile.am                     |   16 ---
 meson.build                         |    1 -
 src/Makefile.am                     |   97 -----------------
 12 files changed, 147 insertions(+), 590 deletions(-)
---
diff --git a/configure b/configure
new file mode 100755
index 0000000..b2a0754
--- /dev/null
+++ b/configure
@@ -0,0 +1,143 @@
+#!/bin/bash
+# configure script adapter for Meson
+# Based on build-api: https://github.com/cgwalters/build-api
+# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
+# Copyright 2016 Emmanuele Bassi
+# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
+
+# Build API variables:
+# buildapi-variable-require-builddir
+
+# Little helper function for reading args from the commandline.
+# it automatically handles -a b and -a=b variants, and returns 1 if
+# we need to shift $3.
+read_arg() {
+    # $1 = arg name
+    # $2 = arg value
+    # $3 = arg parameter
+    local rematch='^[^=]*=(.*)$'
+    if [[ $2 =~ $rematch ]]; then
+       read "$1" <<< "${BASH_REMATCH[1]}"
+    else
+       read "$1" <<< "$3"
+       # There is no way to shift our callers args, so
+       # return 1 to indicate they should do it instead.
+       return 1
+    fi
+}
+
+sanitycheck() {
+    # $1 = arg name
+    # $1 = arg command
+    # $2 = arg alternates
+    local cmd=$( which $2 2>/dev/null )
+
+    if [ -x "$cmd" ]; then
+        read "$1" <<< "$cmd"
+        return 0
+    fi
+
+    test -z $3 || {
+        for alt in $3; do
+            cmd=$( which $alt 2>/dev/null )
+
+            if [ -x "$cmd" ]; then
+                read "$1" <<< "$cmd"
+                return 0
+            fi
+        done
+    }
+
+    echo -e "\e[1;31mERROR\e[0m: Command '$2' not found"
+    exit 1
+}
+
+
+sanitycheck MESON 'meson'
+sanitycheck NINJA 'ninja' 'ninja-build'
+
+enable_docs='-Denable-gtk-doc=false'
+enable_man='-Denable-man=false'
+enable_introspection=''
+
+while (($# > 0)); do
+    case "${1%%=*}" in
+       --prefix) read_arg prefix "$@" || shift;;
+       --bindir) read_arg bindir "$@" || shift;;
+       --sbindir) read_arg sbindir "$@" || shift;;
+       --libexecdir) read_arg libexecdir "$@" || shift;;
+       --datarootdir) read_arg datarootdir "$@" || shift;;
+       --datadir) read_arg datadir "$@" || shift;;
+       --sysconfdir) read_arg sysconfdir "$@" || shift;;
+       --libdir) read_arg libdir "$@" || shift;;
+       --mandir) read_arg mandir "$@" || shift;;
+       --includedir) read_arg includedir "$@" || shift;;
+       --enable-gtk-doc) enable_docs='-Denable-gtk-doc=true';;
+       --disable-gtk-doc) enable_docs='-Denable-gtk-doc=false';;
+       --enable-man) enable_man='-Denable-man=true';;
+       --disable-man) enable_man='-Denable-man=false';;
+       --enable-introspection) enable_introspection='';;
+       --disable-introspection) enable_introspection='-Ddisable_introspection=true';;
+       *) echo -e "\e[1;33mINFO\e[0m: Ignoring unknown option '$1'";;
+    esac
+    shift
+done
+
+# Defaults
+test -z ${prefix} && prefix="/usr/local"
+test -z ${bindir} && bindir=${prefix}/bin
+test -z ${sbindir} && sbindir=${prefix}/sbin
+test -z ${libexecdir} && libexecdir=${prefix}/bin
+test -z ${datarootdir} && datarootdir=${prefix}/share
+test -z ${datadir} && datadir=${datarootdir}
+test -z ${sysconfdir} && sysconfdir=${prefix}/etc
+test -z ${libdir} && libdir=${prefix}/lib
+test -z ${mandir} && mandir=${prefix}/share/man
+test -z ${includedir} && includedir=${prefix}/include
+
+# The source directory is the location of this file
+srcdir=$(dirname $0)
+
+# Wrapper Makefile for Ninja
+cat > Makefile <<END
+# Generated by configure; do not edit
+
+all:
+       CC="\$(CC)" CXX="\$(CXX)" ${NINJA}
+
+install:
+       DESTDIR="\$(DESTDIR)" ${NINJA} install
+END
+
+echo "Summary:"
+echo "  meson:....... ${MESON}"
+echo "  ninja:....... ${NINJA}"
+echo "  prefix:...... ${prefix}"
+echo "  bindir:...... ${bindir}"
+echo "  sbindir:..... ${sbindir}"
+echo "  libexecdir:.. ${libexecdir}"
+echo "  datarootdir:. ${datarootdir}"
+echo "  datadir:..... ${datadir}"
+echo "  sysconfdir:.. ${sysconfdir}"
+echo "  libdir:...... ${libdir}"
+echo "  mandir:...... ${mandir}"
+echo "  includedir:.. ${includedir}"
+echo "  additional:.."
+echo "    - ${enable_docs} ${enable_man} ${enable_introspection}"
+
+exec ${MESON} \
+       --prefix=${prefix} \
+       --libdir=${libdir} \
+       --libexecdir=${libexecdir} \
+       --datadir=${datadir} \
+       --sysconfdir=${sysconfdir} \
+       --bindir=${bindir} \
+       --includedir=${includedir} \
+       --mandir=${mandir} \
+       --default-library shared \
+       ${enable_docs} \
+       ${enable_man} \
+       ${enable_introspection} \
+       ${srcdir}
+
+# vim: ai ts=8 noet sts=2 ft=sh
diff --git a/contrib/gnome-power-manager.spec.in b/contrib/gnome-power-manager.spec.in
index 3d9a46e..795d8a6 100644
--- a/contrib/gnome-power-manager.spec.in
+++ b/contrib/gnome-power-manager.spec.in
@@ -11,12 +11,12 @@ URL: http://projects.gnome.org/gnome-power-manager/
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
-BuildRequires: libtool
 BuildRequires: cairo-devel
 BuildRequires: upower-devel >= 0.9.0
 BuildRequires: glib2-devel >= 2.25.9
 BuildRequires: gtk3-devel >= 2.91.3
 BuildRequires: docbook-utils
+BuildRequires: meson
 
 # obsolete sub-package
 Obsoletes: gnome-power-manager-extra <= 2.30.1
@@ -30,11 +30,11 @@ displaying icons and handling user callbacks in an interactive GNOME session.
 %setup -q
 
 %build
-%configure
-make
+%meson
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 %find_lang %name --with-gnome
 
diff --git a/meson.build b/meson.build
index 48bf3e7..f75f40d 100644
--- a/meson.build
+++ b/meson.build
@@ -97,7 +97,6 @@ configure_file(
   output : 'config.h',
   configuration : conf
 )
-top_build_incdir = include_directories(meson.current_build_dir())
 
 subdir('src')
 subdir('man')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]