[nautilus-python] Some modernization updates in the build system
- From: Adam Plumb <adamplumb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-python] Some modernization updates in the build system
- Date: Tue, 2 Jan 2018 16:38:46 +0000 (UTC)
commit 44d861e667d215ed868b660de11a9ed4f25458c4
Author: Adam Plumb <adamplumb gmail com>
Date: Tue Jan 2 11:38:36 2018 -0500
Some modernization updates in the build system
autogen.sh | 6 ++----
configure.in => configure.ac | 11 +++--------
src/Makefile.am | 2 +-
3 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 70ac5ec..eef00e2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,15 +1,13 @@
#!/bin/sh
-PKG_NAME=nautilus-python
-
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
&& test -f $srcdir/README \
&& test -d $srcdir/src) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level $PKG_NAME directory"
+ echo " top-level nautilus-python directory"
exit 1
}
diff --git a/configure.in b/configure.ac
similarity index 96%
rename from configure.in
rename to configure.ac
index 4d0a110..53f9980 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,15 +1,10 @@
-AC_INIT
+AC_INIT([nautilus-python], [1.2])
-PACKAGE=nautilus-python
-VERSION=1.2
-
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AM_CONFIG_HEADER(config.h)
AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE
+
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I .")
NAUTILUS_REQUIRED=2.32
diff --git a/src/Makefile.am b/src/Makefile.am
index b5030e1..4011ca5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Nautilus-Python\" \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]