Updating branch refs/heads/master
to ae87a210e35443265c2a86070e4ced2639ff3680 (commit)
from 8041e94078b70d14226c73b1843445dada008da3 (commit)
commit ae87a210e35443265c2a86070e4ced2639ff3680
Author: Mike Massonnet <[email protected]>
Date: Sun Jan 24 12:32:59 2010 +0100
Polish over the build env
configure.in.in:
- Update version number
- Some minor rearrangements
- No need to print a warning for xfce4-vala 4.7
src/Makefile.am:
- Move INCLUDES to the top
- Drop custom Vala compilation
- Include all .vala and .c files inside xfmpc_SOURCES
- Add --header=xfmpc.h inside xfmpc_VALAFLAGS
configure.in.in | 39 +++++++++++++++---------------------
src/Makefile.am | 58 ++++++++++++++++++-------------------------------------
2 files changed, 35 insertions(+), 62 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 00327b4..73a1578 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,9 +9,9 @@ dnl *** Version information ***
dnl ***************************
m4_define([xfmpc_version_major], [0])
m4_define([xfmpc_version_minor], [2])
-m4_define([xfmpc_version_micro], [0])
-m4_define([xfmpc_version_build], [...@revision@])
-m4_define([xfmpc_version_tag], []) # leave empty for release
+m4_define([xfmpc_version_micro], [1])
+m4_define([xfmpc_version_build], [...@revision@])
+m4_define([xfmpc_version_tag], [git]) # leave empty for release
m4_define([xfmpc_version],
[xfmpc_version_major().xfmpc_version_minor().xfmpc_version_micro()ifelse(xfmpc_version_tag(),
[git], [xfmpc_version_tag()-xfmpc_version_build()], [xfmpc_version_tag()])])
dnl ***************************
@@ -23,12 +23,12 @@ AC_INIT([Xfmpc], [xfmpc_version],
[http://bugzilla.xfce.org/], [xfmpc],
[http://goodies.xfce.org/projects/applications/xfmpc])
AC_PREREQ([2.50])
AC_CANONICAL_TARGET()
-AC_REVISION([$Id$])
+AC_REVISION([xfmpc_version_build])
dnl ***************************
dnl *** Initialize automake ***
dnl ***************************
-AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2])
AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE()
AM_SILENT_RULES([yes])
@@ -36,6 +36,7 @@ AM_SILENT_RULES([yes])
dnl ********************************
dnl *** Check for basic programs ***
dnl ********************************
+AC_PROG_CC()
AM_PROG_CC_C_O()
AC_PROG_LIBTOOL()
AC_PROG_LD()
@@ -47,40 +48,32 @@ dnl *** Check for standard headers ***
dnl **********************************
AC_HEADER_STDC()
-dnl
-dnl *******************************
-dnl *** Check for X11 installed ***
-dnl *******************************
-XDT_CHECK_LIBX11_REQUIRE()
-
-dnl ******************************
-dnl *** Check for i18n support ***
-dnl ******************************
-XDT_I18N([...@linguas@])
-
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
+XDT_CHECK_LIBX11_REQUIRE()
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
XDT_CHECK_PACKAGE([LIBMPD], [libmpd], [0.15.0])
-dnl Check for valac
+dnl ***********************
+dnl *** Check for valac ***
+dnl ***********************
if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
- AM_PROG_VALAC([0.7.1])
+ AM_PROG_VALAC([0.7.9])
if test "x$VALAC" = "x" ; then
AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
fi
-
XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.6])
- PKG_CHECK_EXISTS([xfce4-vala >= 4.7],
- AC_ERROR([
- *** Build configured for Xfce Panel 4.6 but ***
- *** Xfce Vala bindings for 4.7 are installed ***]), [])
fi
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
+XDT_I18N([...@linguas@])
+
dnl ***********************************
dnl *** Check for debugging support ***
dnl ***********************************
diff --git a/src/Makefile.am b/src/Makefile.am
index 531bc6a..ad9eec8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,14 @@
+INCLUDES = \
+ -I${top_srcdir} \
+ -DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+ -DLOCALEDIR=\""$(localedir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DSRCDIR=\""$(top_srcdir)"\"
+
bin_PROGRAMS = xfmpc
-xfmpc_VALASOURCES = \
+xfmpc_SOURCES =
\
preferences-dialog.vala \
song-dialog.vala \
statusbar.vala \
@@ -10,60 +18,32 @@ xfmpc_VALASOURCES =
\
main-window.vala \
playlist.vala \
preferences.vala \
- main.vala
+ main.vala \
+ mpdclient.c \
+ xfce-arrow-button.c
xfmpc_VALAFLAGS = \
+ --header=xfmpc.h \
--vapidir=. \
--pkg=libxfcegui4-1.0 \
--pkg=config \
--pkg=mpdclient \
--pkg=xfce-arrow-button
-vala_built_SOURCES = \
- $(xfmpc_VALASOURCES:.vala=.c) xfmpc.h
-
-if MAINTAINER_MODE
-
-BUILT_SOURCES = vala.stamp
-vala.stamp: $(xfmpc_VALASOURCES)
- $(VALAC) $(xfmpc_VALAFLAGS) $^ -C -h xfmpc.h
- touch $@
-
-endif
-
-xfmpc_SOURCES = \
- mpdclient.c \
- mpdclient.h \
- xfce-arrow-button.c \
- xfce-arrow-button.h
-xfmpc_SOURCES += $(vala_built_SOURCES)
-
xfmpc_CFLAGS = \
+ @GTHREAD_CFLAGS@ \
+ @LIBX11_CFLAGS@ \
@GTK_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
- @LIBMPD_CFLAGS@ \
- @GTHREAD_CFLAGS@
+ @LIBMPD_CFLAGS@
xfmpc_LDADD = \
+ @GTHREAD_LIBS@ \
+ @LIBX11_LIBS@ \
@GTK_LIBS@ \
@LIBXFCEGUI4_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
- @LIBMPD_LIBS@ \
- @GTHREAD_LIBS@
-
-INCLUDES = \
- -I${top_srcdir} \
- -DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
- -DLOCALEDIR=\""$(localedir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DSRCDIR=\""$(top_srcdir)"\"
-
-EXTRA_DIST = \
- $(xfmpc_VALASOURCES)
-
-CLEANFILES = \
- $(BUILT_SOURCES)
+ @LIBMPD_LIBS@
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
