diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2010-12-21 15:52:59 +0100 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2011-08-15 13:14:09 +0200 |
commit | 8006e4048840186ad81c5575c98417847c9b2bf8 (patch) | |
tree | 030aa22840a804d935f773626d78b341c27d0f9e | |
parent | e2d080612f566205d16a65fdad05618f92774d4c (diff) | |
download | yajl-8006e4048840186ad81c5575c98417847c9b2bf8.tar.gz |
autotools+pkgconfig
-rw-r--r-- | .gitignore | 17 | ||||
-rw-r--r-- | Makefile.am | 42 | ||||
-rw-r--r-- | configure.ac | 42 | ||||
-rwxr-xr-x | git-version-gen | 154 | ||||
-rw-r--r-- | pkgconfig/yajl-uninstalled.pc.in | 9 | ||||
-rw-r--r-- | pkgconfig/yajl.pc.in | 11 | ||||
-rw-r--r-- | src/api/yajl_version.h.in | 23 | ||||
-rw-r--r-- | src/yajl_version.c | 2 |
8 files changed, 299 insertions, 1 deletions
@@ -1,3 +1,20 @@ .DS_Store Makefile /build/ +*.deps/ +*.dirstamp +*.libs/ +*.o +*.lo +*.la +*.pc +config/ +Makefile.in +autom4te.cache/ +aclocal.m4 +.version +config.* +libtool +src/api/yajl_version.h +stamp-h1 + diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..988a7a6 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,42 @@ +EXTRA_DIST = src/YAJL.dxy + +dist_doc_DATA = TODO README + +lib_LTLIBRARIES = libyail.la + +pkginclude_HEADERS = src/api/yajl_parse.h \ + src/api/yajl_gen.h \ + src/api/yajl_common.h \ + src/api/yajl_version.h + +libyail_la_SOURCES = src/yajl.c \ + src/yajl_lex.c \ + src/yajl_parser.c \ + src/yajl_buf.c \ + src/yajl_encode.c \ + src/yajl_gen.c \ + src/yajl_alloc.c \ + src/yajl_version.c \ + src/yajl_parser.h \ + src/yajl_lex.h \ + src/yajl_buf.h \ + src/yajl_encode.h \ + src/yajl_alloc.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = pkgconfig/yail.pc + +BUILT_SOURCES = $(top_srcdir)/.version +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + +libyail_la_CPPFLAGS = -DYAJL_BUILD + +libyail_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +ACLOCAL_AMFLAGS = -I m4 + +INCLUDES = -I. -I${top_srcdir}/src -I${top_srcdir}/src/api + diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..55fab7a --- /dev/null +++ b/configure.ac @@ -0,0 +1,42 @@ +AC_PREREQ(2.61) +AC_INIT([yajl], [m4_esyscmd([./git-version-gen .tarball-version])], + [http://lloyd.github.com/yajl]) +AC_CONFIG_AUX_DIR(config) +AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign subdir-objects]) + +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AM_MAINTAINER_MODE + +AC_PROG_CC_C99 + +LT_INIT + +AC_CONFIG_HEADER([config.h]) + +AC_CONFIG_MACRO_DIR([m4]) + +LT_CURRENT=1 +LT_REVISION=0 +LT_AGE=0 + +YAJL_MAJOR=1 +YAJL_MINOR=0 +YAJL_MICRO=11 + +dnl VERSION="${LT_CURRENT}.${LT_REVISION}.${LT_AGE}" + +AC_SUBST(LT_CURRENT) +AC_SUBST(LT_REVISION) +AC_SUBST(LT_AGE) + +AC_SUBST(YAJL_MAJOR) +AC_SUBST(YAJL_MINOR) +AC_SUBST(YAJL_MICRO) + +AC_CONFIG_FILES([Makefile + src/api/yajl_version.h + pkgconfig/yajl.pc + pkgconfig/yajl-uninstalled.pc]) + +AC_OUTPUT + diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..c655179 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,154 @@ +#!/bin/sh +# Print a version string. +scriptversion=2008-04-08.07 + +# Copyright (C) 2007-2008 Free Software Foundation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project@example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif test -d .git \ + && v=`git describe --tags --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --tags --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + v[0-9]*) ;; + [0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb +# case $v in +# *-*-*) : git describe is okay three part flavor ;; +# *-*) +# : git describe is older two part flavor +# # Recreate the number of commits and rewrite such that the +# # result is the same as if we were using the newer version +# # of git describe. +# vtag=`echo "$v" | sed 's/-.*//'` +# numcommits=`git rev-list "$vtag"..HEAD | wc -l` +# v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; +# ;; +# esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. +# v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; + : +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/pkgconfig/yajl-uninstalled.pc.in b/pkgconfig/yajl-uninstalled.pc.in new file mode 100644 index 0000000..b1733d8 --- /dev/null +++ b/pkgconfig/yajl-uninstalled.pc.in @@ -0,0 +1,9 @@ +libdir=@abs_top_builddir@/.libs +includedir=@abs_top_srcdir@ + +Name: Yajl +Description: Yet Another JSON Library +Version: @VERSION@ +Libs: -L${libdir} -lyajl +Cflags: -I${includedir} + diff --git a/pkgconfig/yajl.pc.in b/pkgconfig/yajl.pc.in new file mode 100644 index 0000000..d8a35b3 --- /dev/null +++ b/pkgconfig/yajl.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Yajl +Description: Yet Another JSON Library +Version: @VERSION@ +Libs: -L${libdir} -lyajl +Cflags: -I${includedir} + diff --git a/src/api/yajl_version.h.in b/src/api/yajl_version.h.in new file mode 100644 index 0000000..ecc221d --- /dev/null +++ b/src/api/yajl_version.h.in @@ -0,0 +1,23 @@ +#ifndef YAJL_VERSION_H_ +#define YAJL_VERSION_H_ + +#include <yajl/yajl_common.h> + +#define YAJL_MAJOR @YAJL_MAJOR@ +#define YAJL_MINOR @YAJL_MINOR@ +#define YAJL_MICRO @YAJL_MICRO@ + +#define YAJL_VERSION ((YAJL_MAJOR * 10000) + (YAJL_MINOR * 100) + YAJL_MICRO) + +#ifdef __cplusplus +extern "C" { +#endif + +extern int YAJL_API yajl_version(void); + +#ifdef __cplusplus +} +#endif + +#endif /* YAJL_VERSION_H_ */ + diff --git a/src/yajl_version.c b/src/yajl_version.c index 0671da7..cc7651e 100644 --- a/src/yajl_version.c +++ b/src/yajl_version.c @@ -1,4 +1,4 @@ -#include <yajl/yajl_version.h> +#include "yajl_version.h" int yajl_version(void) { |