[Xfce4-commits] <xfce4-screenshooter:master> Various fixes for the build system.
Jérôme Guelfucci
jeromeg at xfce.org
Tue Aug 25 22:30:01 CEST 2009
Updating branch refs/heads/master
to 1725ac2bd132b81f0fb7e3a9e1790d1543fdd39b (commit)
from e5ee7cdb3a3ad69ec40205f7a91955b9f68b4d61 (commit)
commit 1725ac2bd132b81f0fb7e3a9e1790d1543fdd39b
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date: Tue Aug 25 22:12:56 2009 +0200
Various fixes for the build system.
Use latest Xfce-dev-tools to get rid of revision and linguas
substitution, remove the LINGUAS file. Use git instead of svn in the
version generation.
Fix distcheck by cleaning some pathes in Makefile.am and adding some
temporary files to POTFILES.skip.
ChangeLog | 11 +++++++++++
Makefile.am | 30 ++++++++++++------------------
autogen.sh | 31 +++----------------------------
configure.ac.in | 6 +++---
po/LINGUAS | 2 --
po/POTFILES.skip | 2 ++
6 files changed, 31 insertions(+), 51 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6793b39..2b431e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-08-25 jeromeg
+
+Various fixes for the build system.
+
+Use latest Xfce-dev-tools to get rid of revision and linguas
+substitution, remove the LINGUAS file. Use git instead of svn in the
+version generation.
+
+Fix distcheck by cleaning some pathes in Makefile.am and adding some
+temporary files to POTFILES.skip.
+
2009-08-14 jeromeg
Generate the marshall header in lib/.
diff --git a/Makefile.am b/Makefile.am
index e502f84..8e71208 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,26 +58,19 @@ BUILT_SOURCES = $(lib_libscreenshooter_built_sources)
lib/screenshooter-marshal.h: lib/stamp-screenshooter-marshal.h
@true
-lib/stamp-screenshooter-marshal.h: lib/screenshooter-marshal.list
- cd $(top_srcdir)/lib && (glib-genmarshal \
- --prefix=_screenshooter_marshal \
- --header screenshooter-marshal.list) >> xgen-emh \
- && ( cmp -s xgen-emh screenshooter-marshal.h || cp xgen-emh screenshooter-marshal.h ) \
- && rm -f xgen-emh \
- && echo timestamp > $(@F)
-
-lib/screenshooter-marshal.c: lib/screenshooter-marshal.list
- cd $(top_srcdir)/lib \
- && echo "#include \"screenshooter-marshal.h\"" > xgen-emc \
- && glib-genmarshal \
- --prefix=_screenshooter_marshal \
- --body screenshooter-marshal.list >> xgen-emc \
- && cp xgen-emc screenshooter-marshal.c \
- && rm -f xgen-emc
+lib/stamp-screenshooter-marshal.h: lib/screenshooter-marshal.list Makefile
+ @echo '/* this file is autogenerated -- do not edit */' >lib/screenshooter-marshal.h
+ glib-genmarshal --prefix=_screenshooter_marshal --header $(top_srcdir)/lib/screenshooter-marshal.list >>lib/screenshooter-marshal.h
+ echo timestamp >$@
+
+lib/screenshooter-marshal.c: lib/screenshooter-marshal.list Makefile
+ @echo '/* this file is autogenerated -- do not edit */' >$@
+ @echo '#include "screenshooter-marshal.h"' >>$@
+ glib-genmarshal --prefix=_screenshooter_marshal --body $(top_srcdir)/lib/screenshooter-marshal.list >>$@
# Main application
src_xfce4_screenshooter_CFLAGS = \
- -Ilib/ \
+ -I$(top_srcdir)/lib/ \
@GTK_CFLAGS@ \
@GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@@ -116,7 +109,7 @@ plugin_PROGRAMS = panel-plugin/xfce4-screenshooter-plugin
panel_plugin_xfce4_screenshooter_plugin_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-I$(top_srcdir) \
- -Ilib/ \
+ -I$(top_srcdir)/lib/ \
@LIBXFCE4PANEL_CFLAGS@ \
@GTHREAD_CFLAGS@ \
@SOUP_CFLAGS@
@@ -350,6 +343,7 @@ DISTCLEANFILES = \
intltool-update \
stamp-screenshooter-marshal.h \
$(lib_libscreenshooter_built_sources) \
+ lib/stamp-screenshooter-marshal.h \
$(app_desktop_DATA) $(app_desktop_in_files) \
$(panel_desktop_DATA) $(panel_desktop_in_files)
diff --git a/autogen.sh b/autogen.sh
index 34b980c..6bc0c8a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,10 +1,12 @@
#!/bin/sh
#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2009
# The Xfce development team. All rights reserved.
#
# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
+
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
autogen.sh: You don't seem to have the Xfce development tools installed on
@@ -15,31 +17,4 @@ EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
- or try to checkout again.
-EOF
- exit 1
-}
-
-echo 'dnl *** This file is automatically generated from configure.ac.in ***' \
- >configure.ac
-echo 'dnl *** DO NOT EDIT! ***' >>configure.ac
-echo >>configure.ac
-
-# substitute revision and linguas
-linguas=$(sed -e '/^#/d' po/LINGUAS)
-if [ -d .git/svn ]; then
- revision=$(git svn find-rev trunk)
-elif [ -d .svn ]; then
- revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}')
-else
- revision=UNKNOWN
-fi
-sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
- < "configure.ac.in" >> "configure.ac"
-
xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index 1ab9b79..e546e48 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -7,9 +7,9 @@ m4_define([xfce4_screenshooter_version_major], [1])
m4_define([xfce4_screenshooter_version_minor], [6])
m4_define([xfce4_screenshooter_version_micro], [0])
m4_define([xfce4_screenshooter_version_nano], [1]) dnl leave this empty to have no nano version
-m4_define([xfce4_screenshooter_version_build], [r at REVISION@])
-m4_define([xfce4_screenshooter_version_tag], [svn])
-m4_define([xfce4_screenshooter_version], [xfce4_screenshooter_version_major().xfce4_screenshooter_version_minor().xfce4_screenshooter_version_micro()ifelse(xfce4_screenshooter_version_nano(), [], [], [.xfce4_screenshooter_version_nano()])ifelse(xfce4_screenshooter_version_tag(), [svn], [xfce4_screenshooter_version_tag()-xfce4_screenshooter_version_build()], [xfce4_screenshooter_version_tag()])])
+m4_define([xfce4_screenshooter_version_build], [@REVISION@])
+m4_define([xfce4_screenshooter_version_tag], [git])
+m4_define([xfce4_screenshooter_version], [xfce4_screenshooter_version_major().xfce4_screenshooter_version_minor().xfce4_screenshooter_version_micro()ifelse(xfce4_screenshooter_version_nano(), [], [], [.xfce4_screenshooter_version_nano()])ifelse(xfce4_screenshooter_version_tag(), [git], [xfce4_screenshooter_version_tag()-xfce4_screenshooter_version_build()], [xfce4_screenshooter_version_tag()])])
AC_INIT([xfce4-screenshooter], [xfce4_screenshooter_version], [http://bugzilla.xfce.org/], [xfce4-screenshooter])
AC_USE_SYSTEM_EXTENSIONS()
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 19bfb48..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast bg ca cs da de el en_GB es et eu fi fr gl hr hu id it ja lv nb nl pl pt pt_BR ro ru sq sv tr uk ur ur_PK vi zh_CN zh_TW
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..33ca584
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,2 @@
+panel-plugin/screenshooter.desktop.in
+src/xfce4-screenshooter.desktop.in
More information about the Xfce4-commits
mailing list