mirror of
https://github.com/elementary/gala.git
synced 2024-08-16 18:40:27 +03:00
build: Drop dependency on gnome-common and some minor updates
This commit is contained in:
parent
7ca4ccbfa6
commit
43085117bb
@ -1,5 +1,7 @@
|
||||
include $(top_srcdir)/Makefile.common
|
||||
|
||||
ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
SUBDIRS = \
|
||||
data \
|
||||
lib \
|
||||
|
58
autogen.sh
58
autogen.sh
@ -4,37 +4,35 @@
|
||||
srcdir=`dirname $0`
|
||||
test -z "$srcdir" && srcdir=.
|
||||
|
||||
PKG_NAME="gala"
|
||||
|
||||
(test -f $srcdir/configure.ac \
|
||||
&& test -f $srcdir/autogen.sh) || {
|
||||
echo -n "**Error**: Directory \`$srcdir' does not look like the"
|
||||
echo " top-level $PKG_NAME directory"
|
||||
exit 1
|
||||
(test -f $srcdir/configure.ac) || {
|
||||
echo "**Error**: Directory "\`$srcdir\'" does not look like the top-level project directory"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if which gnome-autogen.sh ; then
|
||||
REQUIRED_AUTOMAKE_VERSION=1.11 . gnome-autogen.sh
|
||||
else
|
||||
if which intltoolize && which autoreconf ; then
|
||||
intltoolize --copy --force --automake || \
|
||||
(echo "There was an error in running intltoolize." > /dev/stderr;
|
||||
exit 1)
|
||||
autoreconf --force --install || \
|
||||
(echo "There was an error in running autoreconf." > /dev/stderr;
|
||||
exit 1)
|
||||
else
|
||||
echo "No build script available. You have two choices:"
|
||||
echo "1. You need to install the gnome-common module and make"
|
||||
echo " sure the gnome-autogen.sh script is in your \$PATH."
|
||||
echo "2. You need to install the following scripts:"
|
||||
echo " * intltool"
|
||||
echo " * libtool"
|
||||
echo " * automake"
|
||||
echo " * autoconf"
|
||||
echo " Additionally, you need to make"
|
||||
echo " sure that they are in your \$PATH."
|
||||
exit 1
|
||||
fi
|
||||
PKG_NAME=`autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac"`
|
||||
|
||||
if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
|
||||
echo "**Warning**: I am going to run \`configure' with no arguments." >&2
|
||||
echo "If you wish to pass any to it, please specify them on the" >&2
|
||||
echo \`$0\'" command line." >&2
|
||||
echo "" >&2
|
||||
fi
|
||||
|
||||
set -x
|
||||
aclocal --install || exit 1
|
||||
intltoolize --force --copy --automake || exit 1
|
||||
autoreconf --verbose --force --install -Wno-portability || exit 1
|
||||
set +x
|
||||
|
||||
if [ "$NOCONFIGURE" = "" ]; then
|
||||
set -x
|
||||
$srcdir/configure "$@" || exit 1
|
||||
set +x
|
||||
|
||||
if [ "$1" = "--help" ]; then exit 0 else
|
||||
echo "Now type \`make\' to compile $PKG_NAME" || exit 1
|
||||
fi
|
||||
else
|
||||
echo "Skipping configure process."
|
||||
fi
|
||||
|
||||
|
11
configure.ac
11
configure.ac
@ -44,14 +44,19 @@ AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AC_CONFIG_SRCDIR([configure.ac])
|
||||
AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability subdir-objects])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AM_MAINTAINER_MODE([enable])
|
||||
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
AC_DISABLE_STATIC
|
||||
LT_INIT
|
||||
AC_PROG_INSTALL
|
||||
|
||||
LT_PREREQ([2.2.6])
|
||||
LT_INIT([disable-static])
|
||||
PKG_PROG_PKG_CONFIG([0.21])
|
||||
|
||||
LT_LIB_M
|
||||
|
||||
GLIB_GSETTINGS
|
||||
|
||||
AC_SUBST([CFLAGS])
|
||||
|
@ -25,7 +25,7 @@ gala_CFLAGS = \
|
||||
$(NULL)
|
||||
|
||||
gala_LDADD = \
|
||||
-lm \
|
||||
$(LIBM) \
|
||||
$(GALA_CORE_LIBS) \
|
||||
$(top_builddir)/lib/libgala.la \
|
||||
$(NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user