OSDN Git Service

move contents of howm-version.el to howm.el for simplicity
authorHIRAOKA Kazuyuki <khi@users.osdn.me>
Wed, 27 Dec 2017 00:53:45 +0000 (09:53 +0900)
committerHIRAOKA Kazuyuki <khi@users.osdn.me>
Wed, 27 Dec 2017 00:53:45 +0000 (09:53 +0900)
Makefile.am
Makefile.in
bcomp.el
configure
configure.ac
howm-version.el [deleted file]
howm-version.el.in [deleted file]
howm.el
howm.el.in

index 10ce921..4a0a2e4 100644 (file)
@@ -12,7 +12,6 @@ howm_LISP = \
        howm-backend.el \
        howm-common.el \
        howm-vars.el \
-       howm-version.el \
        howm-lang-en.el \
        howm-lang-ja.el \
        howm-menu-en.el \
@@ -25,8 +24,8 @@ howm_LISP = \
        cheat-font-lock.el
 
 EXTRA_DIST = Makefile.old bcomp.el howm-mkmenu.el $(howm_LISP) \
-       bcomp.el.in howm.el.in howm-version.el.in test.bat
-BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/howm-version.el $(srcdir)/bcomp.el
+       bcomp.el.in howm.el.in test.bat
+BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/bcomp.el
 SUBDIRS = doc ext en ja sample
 
 MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
index 586c50e..137c186 100644 (file)
@@ -85,8 +85,8 @@ subdir = .
 DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
        $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) mkinstalldirs \
-       $(srcdir)/howm.el.in $(srcdir)/howm-version.el.in COPYING \
-       config.guess config.sub install-sh missing
+       $(srcdir)/howm.el.in COPYING config.guess config.sub \
+       install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/configure.ac
@@ -95,7 +95,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = howm.el howm-version.el
+CONFIG_CLEAN_FILES = howm.el
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -158,8 +158,8 @@ am__ELFILES = action-lock.el cheat-font-lock.el gfunc.el \
        honest-report.el howm-backend.el howm-common.el howm-date.el \
        howm-lang-en.el howm-lang-ja.el howm-menu-en.el \
        howm-menu-ja.el howm-menu.el howm-misc.el howm-mode.el \
-       howm-reminder.el howm-vars.el howm-version.el howm-view.el \
-       howm.el illusion.el riffle.el
+       howm-reminder.el howm-vars.el howm-view.el howm.el illusion.el \
+       riffle.el
 am__ELCFILES = $(am__ELFILES:.el=.elc)
 ELCFILES = $(LISP:.el=.elc)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
@@ -333,7 +333,6 @@ howm_LISP = \
        howm-backend.el \
        howm-common.el \
        howm-vars.el \
-       howm-version.el \
        howm-lang-en.el \
        howm-lang-ja.el \
        howm-menu-en.el \
@@ -346,9 +345,9 @@ howm_LISP = \
        cheat-font-lock.el
 
 EXTRA_DIST = Makefile.old bcomp.el howm-mkmenu.el $(howm_LISP) \
-       bcomp.el.in howm.el.in howm-version.el.in test.bat
+       bcomp.el.in howm.el.in test.bat
 
-BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/howm-version.el $(srcdir)/bcomp.el
+BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/bcomp.el
 SUBDIRS = doc ext en ja sample
 MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
 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)
 $(am__aclocal_m4_deps):
 howm.el: $(top_builddir)/config.status $(srcdir)/howm.el.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
-howm-version.el: $(top_builddir)/config.status $(srcdir)/howm-version.el.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
 
 .el.elc:
        if test "$(EMACS)" != "no"; then \
index 081d667..ae52cd6 100644 (file)
--- a/bcomp.el
+++ b/bcomp.el
@@ -3,7 +3,7 @@
 
 (setq bcomp-files
       '(
-       "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" 
+       "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" 
        ))
 
 (let* ((dir (expand-file-name default-directory))
index ae06f9f..6481ed4 100755 (executable)
--- a/configure
+++ b/configure
@@ -2825,7 +2825,7 @@ if test `cd ${srcdir}; pwd` != `pwd`; then
 #  AC_CONFIG_LINKS(doc/howm.info:doc/howm.info)
 fi
 
-ac_config_files="$ac_config_files Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el howm-version.el"
+ac_config_files="$ac_config_files Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -3565,7 +3565,6 @@ do
     "ja/Makefile") CONFIG_FILES="$CONFIG_FILES ja/Makefile" ;;
     "sample/Makefile") CONFIG_FILES="$CONFIG_FILES sample/Makefile" ;;
     "howm.el") CONFIG_FILES="$CONFIG_FILES howm.el" ;;
-    "howm-version.el") CONFIG_FILES="$CONFIG_FILES howm-version.el" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
index d37c321..92a7421 100644 (file)
@@ -166,4 +166,4 @@ if test `cd ${srcdir}; pwd` != `pwd`; then
 #  AC_CONFIG_LINKS(doc/howm.info:doc/howm.info)
 fi
 
-AC_OUTPUT([Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el howm-version.el])
+AC_OUTPUT([Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el])
diff --git a/howm-version.el b/howm-version.el
deleted file mode 100644 (file)
index 02010cd..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-;;; howm-version.el --- Wiki-like keyword jump between files
-;;; -*- Emacs-Lisp -*-
-;;; howm-version.el.  Generated from howm-version.el.in by configure.
-
-(provide 'howm-version)
-(defconst howm-version "1.4.5-snapshot")
-
-;;; howm-version.el ends here
diff --git a/howm-version.el.in b/howm-version.el.in
deleted file mode 100644 (file)
index 953b0e5..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-;;; howm-version.el --- Wiki-like keyword jump between files
-;;; -*- Emacs-Lisp -*-
-;;; @configure_input@
-
-(provide 'howm-version)
-(defconst howm-version "@VERSION@")
-
-;;; howm-version.el ends here
diff --git a/howm.el b/howm.el
index 0a012c7..1c8bfa3 100644 (file)
--- a/howm.el
+++ b/howm.el
@@ -30,6 +30,8 @@
 ;;; See README.
 ;;; HOWM is acronym of "Hitori Otegaru Wiki Modoki".
 
+(defconst howm-version "1.4.5-snapshot")
+
 ;; Files [0]-[3] have only hierarchical dependencies,
 ;; whereas files in [5] have circular dependencies.
 ;; Each file in [5] provides itself first,
@@ -46,7 +48,6 @@
 
 ;;; [2] howm basic libraries
 
-(require 'howm-version)
 (require 'howm-vars)
 (require 'howm-common)
 
index 3ad272e..19b453a 100644 (file)
@@ -30,6 +30,8 @@
 ;;; See README.
 ;;; HOWM is acronym of "Hitori Otegaru Wiki Modoki".
 
+(defconst howm-version "@VERSION@")
+
 ;; Files [0]-[3] have only hierarchical dependencies,
 ;; whereas files in [5] have circular dependencies.
 ;; Each file in [5] provides itself first,
@@ -46,7 +48,6 @@
 
 ;;; [2] howm basic libraries
 
-(require 'howm-version)
 (require 'howm-vars)
 (require 'howm-common)