Hitori Otegaru Wiki Modoki
Revision | e62fae6714f2da77e0f6d875baf817770974fbc7 (tree) |
---|---|
Time | 2017-12-27 06:59:03 |
Author | HIRAOKA Kazuyuki <khi@user...> |
Commiter | HIRAOKA Kazuyuki |
simply use autotools macro to set version numbers in *.el
@@ -25,8 +25,8 @@ howm_LISP = \ | ||
25 | 25 | cheat-font-lock.el |
26 | 26 | |
27 | 27 | 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 | |
30 | 30 | SUBDIRS = doc ext en ja sample |
31 | 31 | |
32 | 32 | MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt |
@@ -35,12 +35,6 @@ TEST_INIT = sample/dot.emacs | ||
35 | 35 | |
36 | 36 | AM_MAKEFLAGS = HOWM_MAKE=t |
37 | 37 | |
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 | - | |
44 | 38 | $(MENU_EL): $(srcdir)/howm-mkmenu.el $(MENU_SRC) |
45 | 39 | $(EMACS) -q -batch -l $(srcdir)/howm-mkmenu.el |
46 | 40 |
@@ -85,7 +85,8 @@ subdir = . | ||
85 | 85 | DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ |
86 | 86 | $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
87 | 87 | $(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 | |
89 | 90 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
90 | 91 | am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ |
91 | 92 | $(top_srcdir)/configure.ac |
@@ -94,7 +95,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | ||
94 | 95 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
95 | 96 | configure.lineno config.status.lineno |
96 | 97 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
97 | -CONFIG_CLEAN_FILES = | |
98 | +CONFIG_CLEAN_FILES = howm.el howm-version.el | |
98 | 99 | CONFIG_CLEAN_VPATH_FILES = |
99 | 100 | AM_V_P = $(am__v_P_@AM_V@) |
100 | 101 | am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
@@ -345,9 +346,9 @@ howm_LISP = \ | ||
345 | 346 | cheat-font-lock.el |
346 | 347 | |
347 | 348 | 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 | |
349 | 350 | |
350 | -BUILT_SOURCES = $(srcdir)/howm-version.el $(srcdir)/bcomp.el | |
351 | +BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/howm-version.el $(srcdir)/bcomp.el | |
351 | 352 | SUBDIRS = doc ext en ja sample |
352 | 353 | MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt |
353 | 354 | 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) | ||
383 | 384 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
384 | 385 | $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
385 | 386 | $(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 $@ | |
386 | 391 | |
387 | 392 | .el.elc: |
388 | 393 | if test "$(EMACS)" != "no"; then \ |
@@ -854,12 +859,6 @@ uninstall-am: uninstall-howmLISP | ||
854 | 859 | uninstall-am uninstall-howmLISP |
855 | 860 | |
856 | 861 | |
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 | - | |
863 | 862 | $(MENU_EL): $(srcdir)/howm-mkmenu.el $(MENU_SRC) |
864 | 863 | $(EMACS) -q -batch -l $(srcdir)/howm-mkmenu.el |
865 | 864 |
@@ -2825,7 +2825,7 @@ if test `cd ${srcdir}; pwd` != `pwd`; then | ||
2825 | 2825 | # AC_CONFIG_LINKS(doc/howm.info:doc/howm.info) |
2826 | 2826 | fi |
2827 | 2827 | |
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" | |
2829 | 2829 | |
2830 | 2830 | cat >confcache <<\_ACEOF |
2831 | 2831 | # This file is a shell script that caches the results of configure |
@@ -3564,6 +3564,8 @@ do | ||
3564 | 3564 | "en/Makefile") CONFIG_FILES="$CONFIG_FILES en/Makefile" ;; |
3565 | 3565 | "ja/Makefile") CONFIG_FILES="$CONFIG_FILES ja/Makefile" ;; |
3566 | 3566 | "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" ;; | |
3567 | 3569 | |
3568 | 3570 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
3569 | 3571 | esac |
@@ -166,4 +166,4 @@ if test `cd ${srcdir}; pwd` != `pwd`; then | ||
166 | 166 | # AC_CONFIG_LINKS(doc/howm.info:doc/howm.info) |
167 | 167 | fi |
168 | 168 | |
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]) |
@@ -1,6 +1,6 @@ | ||
1 | 1 | ;;; howm-version.el --- Wiki-like keyword jump between files |
2 | 2 | ;;; -*- Emacs-Lisp -*- |
3 | -;;; @configure_input@ | |
3 | +;;; howm-version.el. Generated from howm-version.el.in by configure. | |
4 | 4 | |
5 | 5 | (provide 'howm-version) |
6 | 6 | (defconst howm-version "1.4.5-snapshot") |
@@ -3,6 +3,6 @@ | ||
3 | 3 | ;;; @configure_input@ |
4 | 4 | |
5 | 5 | (provide 'howm-version) |
6 | -(defconst howm-version "~VERSION~") | |
6 | +(defconst howm-version "@VERSION@") | |
7 | 7 | |
8 | 8 | ;;; howm-version.el ends here |
@@ -1,6 +1,6 @@ | ||
1 | 1 | ;;; howm.el --- Wiki-like note-taking tool |
2 | 2 | ;;; -*- Emacs-Lisp -*- |
3 | -;;; @configure_input@ | |
3 | +;;; howm.el. Generated from howm.el.in by configure. | |
4 | 4 | |
5 | 5 | ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017 HIRAOKA Kazuyuki |
6 | 6 |
@@ -6,7 +6,7 @@ | ||
6 | 6 | |
7 | 7 | ;; Author: HIRAOKA Kazuyuki <khi@users.sourceforge.jp> |
8 | 8 | ;; URL: http://howm.osdn.jp |
9 | -;; Version: ~VERSION~ | |
9 | +;; Version: @VERSION@ | |
10 | 10 | ;; Package-Requires: ((cl-lib "0.5")) |
11 | 11 | |
12 | 12 | ;; This program is free software; you can redistribute it and/or modify |