OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

howm: Commit

Hitori Otegaru Wiki Modoki


Commit MetaInfo

Revisione62fae6714f2da77e0f6d875baf817770974fbc7 (tree)
Time2017-12-27 06:59:03
AuthorHIRAOKA Kazuyuki <khi@user...>
CommiterHIRAOKA Kazuyuki

Log Message

simply use autotools macro to set version numbers in *.el

Change Summary

Incremental Difference

--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,8 @@ howm_LISP = \
2525 cheat-font-lock.el
2626
2727 EXTRA_DIST = Makefile.old bcomp.el howm-mkmenu.el $(howm_LISP) \
28- bcomp.el.in howm-version.el.in test.bat
29-BUILT_SOURCES = $(srcdir)/howm-version.el $(srcdir)/bcomp.el
28+ bcomp.el.in howm.el.in howm-version.el.in test.bat
29+BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/howm-version.el $(srcdir)/bcomp.el
3030 SUBDIRS = doc ext en ja sample
3131
3232 MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
@@ -35,12 +35,6 @@ TEST_INIT = sample/dot.emacs
3535
3636 AM_MAKEFLAGS = HOWM_MAKE=t
3737
38-$(srcdir)/%.el: $(srcdir)/%.el.in $(srcdir)/configure.ac Makefile
39- rm -f $@.tmp && \
40- sed -e 's/~\(VERSION\)~/$(VERSION)/' \
41- $< > $@.tmp && \
42- mv $@.tmp $@
43-
4438 $(MENU_EL): $(srcdir)/howm-mkmenu.el $(MENU_SRC)
4539 $(EMACS) -q -batch -l $(srcdir)/howm-mkmenu.el
4640
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,7 +85,8 @@ subdir = .
8585 DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
8686 $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
8787 $(top_srcdir)/configure $(am__configure_deps) mkinstalldirs \
88- COPYING config.guess config.sub install-sh missing
88+ $(srcdir)/howm.el.in $(srcdir)/howm-version.el.in COPYING \
89+ config.guess config.sub install-sh missing
8990 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9091 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
9192 $(top_srcdir)/configure.ac
@@ -94,7 +95,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9495 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
9596 configure.lineno config.status.lineno
9697 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
97-CONFIG_CLEAN_FILES =
98+CONFIG_CLEAN_FILES = howm.el howm-version.el
9899 CONFIG_CLEAN_VPATH_FILES =
99100 AM_V_P = $(am__v_P_@AM_V@)
100101 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -345,9 +346,9 @@ howm_LISP = \
345346 cheat-font-lock.el
346347
347348 EXTRA_DIST = Makefile.old bcomp.el howm-mkmenu.el $(howm_LISP) \
348- bcomp.el.in howm-version.el.in test.bat
349+ bcomp.el.in howm.el.in howm-version.el.in test.bat
349350
350-BUILT_SOURCES = $(srcdir)/howm-version.el $(srcdir)/bcomp.el
351+BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/howm-version.el $(srcdir)/bcomp.el
351352 SUBDIRS = doc ext en ja sample
352353 MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
353354 MENU_EL = $(srcdir)/howm-menu-en.el $(srcdir)/howm-menu-ja.el
@@ -383,6 +384,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
383384 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
384385 $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
385386 $(am__aclocal_m4_deps):
387+howm.el: $(top_builddir)/config.status $(srcdir)/howm.el.in
388+ cd $(top_builddir) && $(SHELL) ./config.status $@
389+howm-version.el: $(top_builddir)/config.status $(srcdir)/howm-version.el.in
390+ cd $(top_builddir) && $(SHELL) ./config.status $@
386391
387392 .el.elc:
388393 if test "$(EMACS)" != "no"; then \
@@ -854,12 +859,6 @@ uninstall-am: uninstall-howmLISP
854859 uninstall-am uninstall-howmLISP
855860
856861
857-$(srcdir)/%.el: $(srcdir)/%.el.in $(srcdir)/configure.ac Makefile
858- rm -f $@.tmp && \
859- sed -e 's/~\(VERSION\)~/$(VERSION)/' \
860- $< > $@.tmp && \
861- mv $@.tmp $@
862-
863862 $(MENU_EL): $(srcdir)/howm-mkmenu.el $(MENU_SRC)
864863 $(EMACS) -q -batch -l $(srcdir)/howm-mkmenu.el
865864
--- a/configure
+++ b/configure
@@ -2825,7 +2825,7 @@ if test `cd ${srcdir}; pwd` != `pwd`; then
28252825 # AC_CONFIG_LINKS(doc/howm.info:doc/howm.info)
28262826 fi
28272827
2828-ac_config_files="$ac_config_files Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile"
2828+ac_config_files="$ac_config_files Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el howm-version.el"
28292829
28302830 cat >confcache <<\_ACEOF
28312831 # This file is a shell script that caches the results of configure
@@ -3564,6 +3564,8 @@ do
35643564 "en/Makefile") CONFIG_FILES="$CONFIG_FILES en/Makefile" ;;
35653565 "ja/Makefile") CONFIG_FILES="$CONFIG_FILES ja/Makefile" ;;
35663566 "sample/Makefile") CONFIG_FILES="$CONFIG_FILES sample/Makefile" ;;
3567+ "howm.el") CONFIG_FILES="$CONFIG_FILES howm.el" ;;
3568+ "howm-version.el") CONFIG_FILES="$CONFIG_FILES howm-version.el" ;;
35673569
35683570 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
35693571 esac
--- a/configure.ac
+++ b/configure.ac
@@ -166,4 +166,4 @@ if test `cd ${srcdir}; pwd` != `pwd`; then
166166 # AC_CONFIG_LINKS(doc/howm.info:doc/howm.info)
167167 fi
168168
169-AC_OUTPUT([Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile])
169+AC_OUTPUT([Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el howm-version.el])
--- a/howm-version.el
+++ b/howm-version.el
@@ -1,6 +1,6 @@
11 ;;; howm-version.el --- Wiki-like keyword jump between files
22 ;;; -*- Emacs-Lisp -*-
3-;;; @configure_input@
3+;;; howm-version.el. Generated from howm-version.el.in by configure.
44
55 (provide 'howm-version)
66 (defconst howm-version "1.4.5-snapshot")
--- a/howm-version.el.in
+++ b/howm-version.el.in
@@ -3,6 +3,6 @@
33 ;;; @configure_input@
44
55 (provide 'howm-version)
6-(defconst howm-version "~VERSION~")
6+(defconst howm-version "@VERSION@")
77
88 ;;; howm-version.el ends here
--- a/howm.el
+++ b/howm.el
@@ -1,6 +1,6 @@
11 ;;; howm.el --- Wiki-like note-taking tool
22 ;;; -*- Emacs-Lisp -*-
3-;;; @configure_input@
3+;;; howm.el. Generated from howm.el.in by configure.
44
55 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017 HIRAOKA Kazuyuki
66
--- a/howm.el.in
+++ b/howm.el.in
@@ -6,7 +6,7 @@
66
77 ;; Author: HIRAOKA Kazuyuki <khi@users.sourceforge.jp>
88 ;; URL: http://howm.osdn.jp
9-;; Version: ~VERSION~
9+;; Version: @VERSION@
1010 ;; Package-Requires: ((cl-lib "0.5"))
1111
1212 ;; This program is free software; you can redistribute it and/or modify
Show on old repository browser