This is an automated email from the git hooks/post-receive script. js pushed a commit to annotated tag Marpa-R2-2.085_002 in repository libmarpa-r2-perl.
commit 78a083d9197f76e215ceea08e73e1a9bd04da262 Author: Jeffrey Kegler <jk...@cpan.org> Date: Tue Apr 15 18:55:57 2014 -0700 Work on libmarpa version #: config changes --- cpan/libmarpa/Makefile | 6 +----- cpan/libmarpa/ac/Makefile.am | 1 + cpan/libmarpa/ac/configure.ac | 5 ++++- cpan/libmarpa/public/Makefile | 2 +- cpan/libmarpa/public/VERSION | 1 - cpan/libmarpa/public/marpa.h-version | 3 --- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cpan/libmarpa/Makefile b/cpan/libmarpa/Makefile index 2f6959c..9e9d06a 100644 --- a/cpan/libmarpa/Makefile +++ b/cpan/libmarpa/Makefile @@ -53,8 +53,7 @@ STAGE_FILES = \ stage/marpa_tavl.c \ stage/marpa_tavl.h \ stage/NEWS \ - stage/README \ - stage/VERSION + stage/README dummy: @echo install is the main target @@ -115,9 +114,6 @@ stage/marpa_tavl.c: tavl/marpa_tavl.c stage/README: ac/README cp $? $@ -stage/VERSION: public/VERSION - cp $? $@ - stage/NEWS: ac/NEWS cp $? $@ diff --git a/cpan/libmarpa/ac/Makefile.am b/cpan/libmarpa/ac/Makefile.am index e0fa73c..2cf9286 100644 --- a/cpan/libmarpa/ac/Makefile.am +++ b/cpan/libmarpa/ac/Makefile.am @@ -27,6 +27,7 @@ libmarpa_la_SOURCES = marpa.c marpa.h \ marpa_codes.c marpa_slif.c EXTRA_DIST = VERSION libmarpa_la_LIBADD = $(LIBOBJS) +libmarpa_la_LDFLAGS = -release $(MARPA_MAJOR_VERSION).$(MARPA_MINOR_VERSION).$(MARPA_MICRO_VERSION) include_HEADERS = marpa.h \ marpa_avl.h marpa_tavl.h marpa_ami.h \ marpa_slif.h marpa_obs.h diff --git a/cpan/libmarpa/ac/configure.ac b/cpan/libmarpa/ac/configure.ac index 18d3d25..205a8ef 100644 --- a/cpan/libmarpa/ac/configure.ac +++ b/cpan/libmarpa/ac/configure.ac @@ -104,6 +104,9 @@ fi AC_SUBST(WARNING_CFLAGS) AC_SUBST(WARNING_CPPFLAGS) +AC_SUBST(MARPA_MAJOR_VERSION, [marpa_major_version]) +AC_SUBST(MARPA_MINOR_VERSION, [marpa_minor_version]) +AC_SUBST(MARPA_MICRO_VERSION, [marpa_micro_version]) AC_ARG_VAR(MARPA_DEBUG_FLAG,[Marpa debugging]) AC_CHECK_SIZEOF([int]) @@ -125,7 +128,7 @@ fi # The following were suggested by autoscan AC_CHECK_FUNCS([memset]) -AC_CONFIG_FILES( [Makefile]) +AC_CONFIG_FILES( [Makefile VERSION]) AC_OUTPUT # vim: expandtab shiftwidth=4: diff --git a/cpan/libmarpa/public/Makefile b/cpan/libmarpa/public/Makefile index 48966a1..f8dd0d2 100644 --- a/cpan/libmarpa/public/Makefile +++ b/cpan/libmarpa/public/Makefile @@ -23,7 +23,7 @@ CPPWRAP = perl ../bin/cppwrap.pl C_LANGUAGE_PREAMBLE = ../shared/license.c ../shared/do_not_edit.c MARPA_H_PIECES = $(C_LANGUAGE_PREAMBLE) \ - marpa.h.p10 marpa.h-version marpa.h-err \ + marpa.h.p10 marpa.h-err \ marpa.h-event marpa.h-step \ marpa.h.p50 marpa.h.p80 marpa.h.p90 diff --git a/cpan/libmarpa/public/VERSION b/cpan/libmarpa/public/VERSION deleted file mode 100644 index 4a36342..0000000 --- a/cpan/libmarpa/public/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.0 diff --git a/cpan/libmarpa/public/marpa.h-version b/cpan/libmarpa/public/marpa.h-version deleted file mode 100644 index 2465fec..0000000 --- a/cpan/libmarpa/public/marpa.h-version +++ /dev/null @@ -1,3 +0,0 @@ -#define MARPA_MAJOR_VERSION 3 -#define MARPA_MINOR_VERSION 0 -#define MARPA_MICRO_VERSION 0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmarpa-r2-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits