From: ueno Date: Wed, 30 Jan 2002 12:23:40 +0000 (+0000) Subject: * lisp/Makefile: Rename to Makefile.lisp. X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30a88cd059fda7743a4914539cd8b37c948bb20a;p=elisp%2Fliece.git * lisp/Makefile: Rename to Makefile.lisp. * lisp/Makefile.am: Leave everything into Makefile.lisp. --- diff --git a/lisp/Makefile b/lisp/Makefile deleted file mode 100644 index 40b7dd0..0000000 --- a/lisp/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -*- makefile -*- -# -# Makefile for liece -# -# - -PACKAGE = liece -VERSION = 1.4 - -EMACS = emacs -XEMACS = xemacs -FLAGS = -batch -q -no-site-file -TAR = tar - -PREFIX = NONE -LISPDIR = NONE -PACKAGEDIR = NONE -VERSION_SPECIFIC_LISPDIR = NONE - -GOMI = liece-setup.el *.elc - -all: elc - -elc: - $(EMACS) $(FLAGS) -l ./liece-make.el -f autoload-liece \ - $(PREFIX) $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) - $(EMACS) $(FLAGS) -l ./liece-make.el -f compile-liece \ - $(PREFIX) $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) - -install: elc - $(EMACS) $(FLAGS) -l ./liece-make.el -f install-liece \ - $(PREFIX) $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) - -package: - $(XEMACS) $(FLAGS) -l ./liece-make.el -f autoload-liece \ - $(PREFIX) $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) - $(XEMACS) $(FLAGS) -l ./liece-make.el -f compile-liece-package \ - $(PACKAGEDIR) - -install-package: package - $(XEMACS) $(FLAGS) -l ./liece-make.el -f install-liece-package \ - $(PACKAGEDIR) - -tag: - sh -c 'cvs tag -RF liece-`echo $(VERSION) | \ - tr . _`-`date +%Y%m%d%H%m`' - -clean: - -rm -f $(GOMI) diff --git a/lisp/Makefile.am b/lisp/Makefile.am index 749bd9e..d6d9ce2 100644 --- a/lisp/Makefile.am +++ b/lisp/Makefile.am @@ -1,69 +1,7 @@ -## Process this file with automake to produce Makefile.in -## We do not use automake's emacs-lisp support. +EXTRA_DIST = $(wildcard *.el) Makefile.lisp +DISTCLEANFILES = liece-setup.el -SOURCES = liece-clfns.el liece-handler.el gettext.el \ - liece-compat.el liece-version.el \ - liece-vars.el liece-globals.el liece-inlines.el \ - liece-filter.el liece-dcc.el liece-menu.el \ - liece-000.el liece-200.el liece-300.el liece-400.el liece-500.el \ - liece-nick.el liece-channel.el \ - liece-commands.el liece-ctcp.el \ - liece-handle.el liece-hilit.el liece-intl.el liece-mail.el \ - liece-minibuf.el liece-misc.el liece-url.el liece-message.el \ - liece-x-face.el liece-tcp.el liece-coding.el \ - queue-m.el liece.el \ - liece-window.el +all: elc -EXTRA_DIST = liece-make.el liece-config.el liece-modules.el \ - liece-emacs.el liece-xemacs.el \ - liece-q-ccl.el liece-q-el.el \ - bitmap-stipple.el \ - liece.xpm liece.xbm - -TARGETS = $(SOURCES:.el=.elc) - -if USE_CUSTOM_LISPDIR -LISPDIR = $(lispdir) -VERSION_SPECIFIC_LISPDIR = $(lispdir)/emu -else -LISPDIR = NONE -VERSION_SPECIFIC_LISPDIR = NONE -endif - -if USE_CUSTOM_PACKAGEDIR -PACKAGEDIR = $(packagedir) -else -PACKAGEDIR = NONE -endif - -EMACS_AUTOLOAD_FLAGS = -f autoload-liece - -if USE_PACKAGE -EMACS_COMPILE_FLAGS = -f compile-liece-package $(PACKAGEDIR) -EMACS_INSTALL_FLAGS = -f install-liece-package $(PACKAGEDIR) -else -EMACS_COMPILE_FLAGS = -f compile-liece \ - NONE $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) -EMACS_INSTALL_FLAGS = -f install-liece \ - NONE $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) -endif - - -all: $(TARGETS) - -$(TARGETS): liece-make.el liece-setup.el $(SOURCES) - $(EMACS) -batch -q -no-site-file -l ./liece-make.el \ - $(EMACS_COMPILE_FLAGS) - -liece-setup.el: - $(EMACS) -batch -q -no-site-file -l ./liece-make.el \ - $(EMACS_AUTOLOAD_FLAGS) - -install-exec-local: $(TARGETS) - $(EMACS) -batch -q -no-site-file -l ./liece-make.el \ - $(EMACS_INSTALL_FLAGS) - -clean-local: - -rm *.elc liece-setup.el - -.PHONY: update +elc package install install-package clean: + $(MAKE) $(AM_MAKEFLAGS) -f Makefile.lisp $@ diff --git a/lisp/Makefile.lisp b/lisp/Makefile.lisp new file mode 100644 index 0000000..192f563 --- /dev/null +++ b/lisp/Makefile.lisp @@ -0,0 +1,39 @@ +PACKAGE = liece +VERSION = 2.0 + +EMACS = emacs +XEMACS = xemacs +FLAGS = -batch -q -no-site-file +TAR = tar + +PREFIX = NONE +LISPDIR = NONE +PACKAGEDIR = NONE +VERSION_SPECIFIC_LISPDIR = NONE + +GOMI = liece-setup.el *.elc + +all: elc + +elc: + $(EMACS) $(FLAGS) -l ./liece-make.el -f autoload-liece \ + $(PREFIX) $(LISPDIR) + $(EMACS) $(FLAGS) -l ./liece-make.el -f compile-liece \ + $(PREFIX) $(LISPDIR) + +install: elc + $(EMACS) $(FLAGS) -l ./liece-make.el -f install-liece \ + $(PREFIX) $(LISPDIR) + +package: + $(XEMACS) $(FLAGS) -l ./liece-make.el -f autoload-liece \ + $(PREFIX) $(LISPDIR) + $(XEMACS) $(FLAGS) -l ./liece-make.el -f compile-liece-package \ + $(PACKAGEDIR) + +install-package: package + $(XEMACS) $(FLAGS) -l ./liece-make.el -f install-liece-package \ + $(PACKAGEDIR) + +clean: + -rm -f $(GOMI)