A few updates/fixes/improvements

[emoney] / Makefile

diff --git a/Makefile b/Makefile
index 59f0175..2c4ed82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 ## Makefile for eMoney   -*-Makefile-*-
-## $Id: Makefile,v 1.6 2004/06/29 23:31:14 youngs Exp $
 ##
-## Copyright (C) 2003 - 2007 Steve Youngs
+## Copyright (C) 2003 - 2017 Steve Youngs
 ##
 ## This file is part of eMoney.
 ##
@@ -33,7 +32,7 @@
 ## IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PACKAGE = emoney
-VER = 0.6
+VER = 1.0
 
 # csh... yell no, we won't go!
 SHELL = /bin/sh
@@ -81,47 +80,19 @@ LISP_STAGING = $(STAGING)/lisp/$(PACKAGE)
 SOURCES = $(wildcard ./emoney*.el)
 OBJECTS = $(SOURCES:.el=.elc)
 EXTRA_SRC =
-EXTRA_OBJ = $(wildcard ./auto-autoloads.el*) $(wildcard ./custom-load.el*)
+EXTRA_OBJ = $(wildcard ./auto-autoloads.el*) $(wildcard ./custom-*.el*)
 
-PRELOADS = -eval \("push default-directory load-path"\)
-AUTOLOAD_PACKAGE_NAME = (setq autoload-package-name \"$(PACKAGE)\")
-AUTOLOAD_FILE = (setq generated-autoload-file \"./auto-autoloads.el\")
+all:: emoney-version.el compile
 
-
-.SUFFIXES:
-.SUFFIXES: .elc .el
-
-all:: emoney-version.el autoloads customloads compile
-
-autoloads: auto-autoloads.el
-
-customloads: custom-load.el
-
-compile: $(SOURCES) auto-autoloads.el custom-load.el
-       $(XEMACS) $(XEMACS_FLAGS) $(PRELOADS) \
-               -l bytecomp \
-               -l byte-optimize \
-                -f batch-byte-compile $^
-
-auto-autoloads.el : $(SOURCES) emoney-version.el
-       $(XEMACS) $(XEMACS_FLAGS) $(PRELOADS) \
-               -eval "$(AUTOLOAD_PACKAGE_NAME)" \
-               -eval "$(AUTOLOAD_FILE)" \
-               -l autoload -f batch-update-autoloads $^
-       @rm -f $(AUTOLOAD_PATH)/auto-autoloads.el~
-
-custom-load.el : $(SOURCES)
-       $(XEMACS) $(XEMACS_FLAGS) $(PRELOADS) -l cus-dep \
-               -f Custom-make-dependencies ./
-       @touch ./custom-load.el
-       @rm -f ./custom-load.el~
+compile: 
+       $(XEMACS) $(XEMACS_FLAGS) -l "build.el"
 
 emoney-version.el:
        echo ";;; Automatically generated file -- DO NOT EDIT OR DELETE" > $@
        echo ";;;###autoload" >> $@
        echo "(defconst emoney-version" >> $@
-       if [[ -d "./{arch}" && -x `which tla 2>/dev/null` ]]; then \
-               printf '  "%s"' `tla logs -f|tail -n1` >> $@; \
+       if [[ -d ".git" && -x `which git 2>/dev/null` ]]; then \
+               printf '  "%s"' `git describe` >> $@; \
        else \
                echo -n '  "$(VER)"' >> $@; \
        fi
@@ -150,8 +121,8 @@ uninstall::
 
 
 clean::
-       rm -f $(OBJECTS) $(INFO_FILES) \
-               auto-autoloads.el* custom-load.el*
+       rm -f $(OBJECTS) \
+               auto-autoloads.el* custom-*.el*
 
 distclean: clean
        rm -f core* *~ TAGS tags emoney-version.el*