Commits

Anonymous committed 5fc4829

The meat from Ben's packages patch <n0nrtshm.fsf@xemacs.org>

Comments (0)

Files changed (2)

 2002-11-29  Ben Wing  <ben@xemacs.org>
 
 	* .cvsignore: Remove files now handled automatically by CVS.
+	* Makefile: Use `compile' instead of hard-coded `all'.
+
+	* Makefile (INFO_FILES):
+	* Makefile (OTHER_ELCS): Removed.
+	* Makefile (loadfile):
+	Build ilisp using the standard Makefile scheme, instead of the
+	special ilisp-mak.el, which is not smart enough to do dependency
+	checking and thus always rebuilds from scratch.
 
 2002-10-15  Ville Skyttä  <scop@xemacs.org>
 
 REQUIRES = xemacs-base mail-lib fsf-compat eterm sh-script
 CATEGORY = standard
 
-ELCS =  ilisp.elc bridge.elc comint-ipc.elc completer.elc \
-	ild.elc ilisp-cl-easy-menu.elc ilisp-imenu.elc \
-	ilisp-scheme-easy-menu.elc ilisp-def.elc ilisp-sym.elc \
+PRELOADS = -l ilisp-def -l comint
+
+ELCS =  ilxemacs.elc ilcompat.elc completer.elc comint-ipc.elc bridge.elc \
+	ilisp-def.elc ilisp-sym.elc \
 	ilisp-inp.elc ilisp-ind.elc ilisp-prc.elc ilisp-val.elc \
-	ilisp-ccl.elc ilisp-openmcl.elc ilisp-out.elc ilisp-mov.elc \
+	ilisp-out.elc ilisp-mov.elc \
 	ilisp-key.elc ilisp-prn.elc ilisp-low.elc ilisp-doc.elc \
 	ilisp-ext.elc ilisp-mod.elc ilisp-dia.elc ilisp-cmt.elc \
 	ilisp-rng.elc ilisp-hnd.elc ilisp-utl.elc ilisp-cmp.elc \
 	ilisp-kil.elc ilisp-snd.elc ilisp-xfr.elc ilisp-hi.elc \
-	ilisp-aut.elc ilisp-cl.elc ilisp-cmu.elc ilisp-sbcl.elc \
-	ilisp-acl.elc ilisp-kcl.elc ilisp-luc.elc ilisp-sch.elc \
-	ilisp-hlw.elc ilisp-xls.elc ilisp-chs.elc ilxemacs.elc
+	ilisp-aut.elc ilisp-mnb.elc ild.elc \
+	ilisp-cl.elc ilisp-ccl.elc ilisp-cmu.elc ilisp-sbcl.elc \
+	ilisp-chs.elc ilisp-acl.elc ilisp-kcl.elc ilisp-hlw.elc \
+	ilisp-luc.elc ilisp-xls.elc ilisp-openmcl.elc ilisp-sch.elc \
+	ilisp-cl-easy-menu.elc ilisp-scheme-easy-menu.elc ilisp-imenu.elc \
+	ilisp.elc
 
 ELCS_1 = extra/hyperspec.elc extra/cltl2.elc
 ELCS_1_DEST = ilisp/extra
 ELCS_1_FILES = extra/README extra/hyperspec.el extra/cltl2.el
 
-OTHER_ELCS = bridge.elc ilcompat.elc \
-	ilisp-mnb.elc ilisp.elc ilxemacs.elc
-
 INFO_FILES = docs/$(PACKAGE).info*
 TEXI_FILES = docs/$(PACKAGE).texi docs/README docs/doc-changes.txt \
 	     docs/Makefile
 DATA_FILES = pictures/ilisp*
 DATA_DEST = ilisp
 
-rules-file = $(wildcard ../../XEmacs.rules)
-ifeq ($(rules-file),)
-        BOOT_XEMACS ?= xemacs -batch
-	DOCS = ../../man/ilisp
-else
-        include ../../XEmacs.rules
-	DOCS = docs
-endif
+include ../../XEmacs.rules
+DOCS = docs
 
 FaslFiles = *.fasl *.fas *.lib *.x86f *.sparcf *.pfsl
 
 # The 'rm' command used (we redefine it mostly because it may be
-# aliased
+# aliased)
 RM = /bin/rm -f
 
-all:: compile auto-autoloads.elc $(DOCS)/ilisp.info
+compile:: $(ELCS) auto-autoloads.elc $(DOCS)/ilisp.info
 
 html:
 	$(MAKE) -C docs PACKAGE=$(PACKAGE) html
 
-compile:
-	$(BOOT_XEMACS) -l ilisp-mak.el
-
 compress:
 	gzip *.el
 
 binkit: binkit-common
 
 clean::
-	-$(RM) $(ELCS) $(ELCS_1) *~ $(OTHER_ELCS) \
+	-$(RM) $(ELCS) $(ELCS_1) *~ \
 	extra/*~ TAGS $(FaslFiles) $(INFO_FILES)
 	$(MAKE) $(MFLAGS) -C $(DOCS) clean
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.