• R/O
  • HTTP
  • SSH
  • HTTPS

howm: Commit

Hitori Otegaru Wiki Modoki


Commit MetaInfo

Revision3e16f70440a779c79d064530b708eed67ffc7fdb (tree)
Time2017-12-27 09:53:45
AuthorHIRAOKA Kazuyuki <khi@user...>
CommiterHIRAOKA Kazuyuki

Log Message

move contents of howm-version.el to howm.el for simplicity

Change Summary

Incremental Difference

--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,6 @@ howm_LISP = \
1212 howm-backend.el \
1313 howm-common.el \
1414 howm-vars.el \
15- howm-version.el \
1615 howm-lang-en.el \
1716 howm-lang-ja.el \
1817 howm-menu-en.el \
@@ -25,8 +24,8 @@ howm_LISP = \
2524 cheat-font-lock.el
2625
2726 EXTRA_DIST = Makefile.old bcomp.el howm-mkmenu.el $(howm_LISP) \
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
27+ bcomp.el.in howm.el.in test.bat
28+BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/bcomp.el
3029 SUBDIRS = doc ext en ja sample
3130
3231 MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,8 +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- $(srcdir)/howm.el.in $(srcdir)/howm-version.el.in COPYING \
89- config.guess config.sub install-sh missing
88+ $(srcdir)/howm.el.in COPYING config.guess config.sub \
89+ install-sh missing
9090 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9191 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
9292 $(top_srcdir)/configure.ac
@@ -95,7 +95,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9595 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
9696 configure.lineno config.status.lineno
9797 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
98-CONFIG_CLEAN_FILES = howm.el howm-version.el
98+CONFIG_CLEAN_FILES = howm.el
9999 CONFIG_CLEAN_VPATH_FILES =
100100 AM_V_P = $(am__v_P_@AM_V@)
101101 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -158,8 +158,8 @@ am__ELFILES = action-lock.el cheat-font-lock.el gfunc.el \
158158 honest-report.el howm-backend.el howm-common.el howm-date.el \
159159 howm-lang-en.el howm-lang-ja.el howm-menu-en.el \
160160 howm-menu-ja.el howm-menu.el howm-misc.el howm-mode.el \
161- howm-reminder.el howm-vars.el howm-version.el howm-view.el \
162- howm.el illusion.el riffle.el
161+ howm-reminder.el howm-vars.el howm-view.el howm.el illusion.el \
162+ riffle.el
163163 am__ELCFILES = $(am__ELFILES:.el=.elc)
164164 ELCFILES = $(LISP:.el=.elc)
165165 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
@@ -333,7 +333,6 @@ howm_LISP = \
333333 howm-backend.el \
334334 howm-common.el \
335335 howm-vars.el \
336- howm-version.el \
337336 howm-lang-en.el \
338337 howm-lang-ja.el \
339338 howm-menu-en.el \
@@ -346,9 +345,9 @@ howm_LISP = \
346345 cheat-font-lock.el
347346
348347 EXTRA_DIST = Makefile.old bcomp.el howm-mkmenu.el $(howm_LISP) \
349- bcomp.el.in howm.el.in howm-version.el.in test.bat
348+ bcomp.el.in howm.el.in test.bat
350349
351-BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/howm-version.el $(srcdir)/bcomp.el
350+BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/bcomp.el
352351 SUBDIRS = doc ext en ja sample
353352 MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
354353 MENU_EL = $(srcdir)/howm-menu-en.el $(srcdir)/howm-menu-ja.el
@@ -386,8 +385,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
386385 $(am__aclocal_m4_deps):
387386 howm.el: $(top_builddir)/config.status $(srcdir)/howm.el.in
388387 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 $@
391388
392389 .el.elc:
393390 if test "$(EMACS)" != "no"; then \
--- a/bcomp.el
+++ b/bcomp.el
@@ -3,7 +3,7 @@
33
44 (setq bcomp-files
55 '(
6- "howm.el" "howm-menu.el" "howm-reminder.el" "howm-date.el" "howm-misc.el" "howm-mode.el" "howm-view.el" "howm-backend.el" "howm-common.el" "howm-vars.el" "howm-version.el" "howm-lang-en.el" "howm-lang-ja.el" "howm-menu-en.el" "howm-menu-ja.el" "honest-report.el" "action-lock.el" "riffle.el" "gfunc.el" "illusion.el" "cheat-font-lock.el"
6+ "howm.el" "howm-menu.el" "howm-reminder.el" "howm-date.el" "howm-misc.el" "howm-mode.el" "howm-view.el" "howm-backend.el" "howm-common.el" "howm-vars.el" "howm-lang-en.el" "howm-lang-ja.el" "howm-menu-en.el" "howm-menu-ja.el" "honest-report.el" "action-lock.el" "riffle.el" "gfunc.el" "illusion.el" "cheat-font-lock.el"
77 ))
88
99 (let* ((dir (expand-file-name default-directory))
--- 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 howm.el howm-version.el"
2828+ac_config_files="$ac_config_files Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el"
28292829
28302830 cat >confcache <<\_ACEOF
28312831 # This file is a shell script that caches the results of configure
@@ -3565,7 +3565,6 @@ do
35653565 "ja/Makefile") CONFIG_FILES="$CONFIG_FILES ja/Makefile" ;;
35663566 "sample/Makefile") CONFIG_FILES="$CONFIG_FILES sample/Makefile" ;;
35673567 "howm.el") CONFIG_FILES="$CONFIG_FILES howm.el" ;;
3568- "howm-version.el") CONFIG_FILES="$CONFIG_FILES howm-version.el" ;;
35693568
35703569 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
35713570 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 howm.el howm-version.el])
169+AC_OUTPUT([Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el])
--- a/howm-version.el
+++ /dev/null
@@ -1,8 +0,0 @@
1-;;; howm-version.el --- Wiki-like keyword jump between files
2-;;; -*- Emacs-Lisp -*-
3-;;; howm-version.el. Generated from howm-version.el.in by configure.
4-
5-(provide 'howm-version)
6-(defconst howm-version "1.4.5-snapshot")
7-
8-;;; howm-version.el ends here
--- a/howm-version.el.in
+++ /dev/null
@@ -1,8 +0,0 @@
1-;;; howm-version.el --- Wiki-like keyword jump between files
2-;;; -*- Emacs-Lisp -*-
3-;;; @configure_input@
4-
5-(provide 'howm-version)
6-(defconst howm-version "@VERSION@")
7-
8-;;; howm-version.el ends here
--- a/howm.el
+++ b/howm.el
@@ -30,6 +30,8 @@
3030 ;;; See README.
3131 ;;; HOWM is acronym of "Hitori Otegaru Wiki Modoki".
3232
33+(defconst howm-version "1.4.5-snapshot")
34+
3335 ;; Files [0]-[3] have only hierarchical dependencies,
3436 ;; whereas files in [5] have circular dependencies.
3537 ;; Each file in [5] provides itself first,
@@ -46,7 +48,6 @@
4648
4749 ;;; [2] howm basic libraries
4850
49-(require 'howm-version)
5051 (require 'howm-vars)
5152 (require 'howm-common)
5253
--- a/howm.el.in
+++ b/howm.el.in
@@ -30,6 +30,8 @@
3030 ;;; See README.
3131 ;;; HOWM is acronym of "Hitori Otegaru Wiki Modoki".
3232
33+(defconst howm-version "@VERSION@")
34+
3335 ;; Files [0]-[3] have only hierarchical dependencies,
3436 ;; whereas files in [5] have circular dependencies.
3537 ;; Each file in [5] provides itself first,
@@ -46,7 +48,6 @@
4648
4749 ;;; [2] howm basic libraries
4850
49-(require 'howm-version)
5051 (require 'howm-vars)
5152 (require 'howm-common)
5253
Show on old repository browser