[Xfce4-commits] [apps/xfburn] 01/01: Some autoconf/automake modernization

noreply at xfce.org noreply at xfce.org
Sun May 17 03:47:15 CEST 2015


This is an automated email from the git hooks/post-receive script.

squisher pushed a commit to branch master
in repository apps/xfburn.

commit 9bbf7a6ea9e1b9052315771e06f1ae5c7cad0fc4
Author: David Mohr <david at mcbf.net>
Date:   Sat May 16 19:46:53 2015 -0600

    Some autoconf/automake modernization
---
 .gitignore                         |    2 +-
 autogen.sh                         |    2 +-
 configure.in.in => configure.ac.in |    8 ++++----
 xfburn/Makefile.am                 |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 604d853..1e30c63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ xfburn.desktop
 intltool-extract
 intltool-extract.in
 intltool-update
-configure.in
+configure.ac
 intltool-update.in
 intltool-merge.in
 autogen.configureflags
diff --git a/autogen.sh b/autogen.sh
index 068a244..bd7579d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,7 +31,7 @@ fi
 
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
-    < "configure.in.in" > "configure.in"
+    < "configure.ac.in" > "configure.ac"
 
 if test -f autogen.configureflags; then
   configureflags=`cat autogen.configureflags`
diff --git a/configure.in.in b/configure.ac.in
similarity index 94%
rename from configure.in.in
rename to configure.ac.in
index 0bf3b4d..7300ce0 100644
--- a/configure.in.in
+++ b/configure.ac.in
@@ -10,17 +10,18 @@ m4_define([xfburn_version], [xfburn_version_major().xfburn_version_minor().xfbur
 
 dnl Initialize autoconf
 AC_COPYRIGHT([Copyright (c) 2005-2008 Jean-François Wauthy <pollux at xfce.org>, 2008-2015 David Mohr <david at mcbf.net>])
-AC_INIT([xfburn], [xfburn_version], [xfburn at xfce.org])
+AC_INIT([xfburn], [xfburn_version])
+AC_CONFIG_SRCDIR([xfburn/xfburn-main.c])
 
 dnl Initialize automake
-AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
+AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE()
 
 dnl check for basic programs
 AC_PROG_CC()
 AC_PROG_INSTALL()
-AC_PROG_INTLTOOL([0.31], [no-xml])
+IT_PROG_INTLTOOL([0.35.0])
 LT_PREREQ([2.2.6])
 LT_INIT()
 
@@ -75,4 +76,3 @@ docs/Makefile
 desktop-integration/Makefile
 xfburn/Makefile
 ])
-	
diff --git a/xfburn/Makefile.am b/xfburn/Makefile.am
index afaf322..0eee23b 100644
--- a/xfburn/Makefile.am
+++ b/xfburn/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 								\
+AM_CPPFLAGS = 								\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-DEXO_API_SUBJECT_TO_CHANGE					\
 	-DEXO_DISABLE_DEPRECATED					\

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list