[gxml] Fixes on Autotools build system
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Fixes on Autotools build system
- Date: Wed, 5 Jul 2017 00:41:34 +0000 (UTC)
commit 3dde3d8dd8ab8f0979573faa2219a8d78a3693da
Author: Daniel Espinosa <esodan gmail com>
Date: Tue Jul 4 19:39:55 2017 -0500
Fixes on Autotools build system
configure.ac | 8 ++++++--
gxml/gxml.pc.in | 2 +-
gxml/meson.build | 2 +-
gxml/namespace-info.vala.in | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ea4b22a..abe5489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
# Release Version
m4_define([project_major_version], [0])
m4_define([project_minor_version], [15])
-m4_define([project_micro_version], [0])
+m4_define([project_micro_version], [1])
m4_define([project_nano_version], [0])
# LT_VERSION
@@ -89,7 +89,7 @@ AC_SUBST([LT_AGE])
PROJECT_MAJOR_MINOR_VERSION=project_major_minor_version
AC_SUBST([PROJECT_MAJOR_MINOR_VERSION])
-# This is used to identify a set of API compatible beatween versions
+# This is used to identify a set of API compatible beatween versions
# - If new versions are compatible with the actual one, just leave this untouched
# - If new version breaks API change it in order to allow paralled installations
# with old versions. Change name of pc files to use a new API too.
@@ -98,6 +98,10 @@ API_MAJOR_VERSION=0
API_MINOR_VERSION=16
AC_SUBST([API_VERSION])
AC_SUBST([API_UNDERSCORE_VERSION])
+PROJECT_NAME=gxml
+AC_SUBST(PROJECT_NAME)
+CAMEL_CASE_NAME=GXml
+AC_SUBST(CAMEL_CASE_NAME)
PROJECT_VERSION=project_base_version
AC_SUBST([PROJECT_VERSION])
diff --git a/gxml/gxml.pc.in b/gxml/gxml.pc.in
index 673fdcb..241bf0e 100644
--- a/gxml/gxml.pc.in
+++ b/gxml/gxml.pc.in
@@ -8,6 +8,6 @@ Name: libgxml
Description: GObject API for XML manipulation and serialization library
URL: http://live.gnome.org/GXml
Version: @PROJECT_VERSION@
-Requires: @PCDEPS@
+Requires: glib-2.0 >= 2.50 gio-2.0 >= 2.50 gobject-2.0 >= 2.50 libxml-2.0 > 2.8 gee-0.8 > 0.18
Libs: -L${libdir} -lgxml-@API_VERSION@
Cflags: -I${includedir}/gxml-@API_VERSION@
diff --git a/gxml/meson.build b/gxml/meson.build
index 2a82832..a27cf6e 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -142,7 +142,7 @@ lib = library(VERSIONED_PROJECT_NAME,
install : true,
install_dir : [
get_option('libdir'),
- join_paths (get_option('includedir'),'gxml-@0@'.format (API_VERSION)),
+ join_paths (get_option('includedir'), 'gxml','gxml-@0@'.format (API_VERSION)),
vapidir,
true
])
diff --git a/gxml/namespace-info.vala.in b/gxml/namespace-info.vala.in
index 2b7dd2d..9d92094 100644
--- a/gxml/namespace-info.vala.in
+++ b/gxml/namespace-info.vala.in
@@ -2,7 +2,7 @@
/* Attr.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011, 2017 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -22,5 +22,5 @@
* Richard Schwarting <aquarichy gmail com>
* Daniel Espinosa <esodan gmail com>
*/
-[CCode (gir_namespace = "GXml", gir_version = "@API_VERSION@")]
+[CCode (gir_namespace = "GXml", gir_version = "@API_VERSION@", cheader_filename = "gxml/@PROJECT_NAME@.h")]
namespace GXml {}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]