projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deliver each contrib as a single FASL. Don't implicitly require ASDF or source code...
[sbcl.git]
/
contrib
/
asdf-module.mk
diff --git
a/contrib/asdf-module.mk
b/contrib/asdf-module.mk
index
dba81ea
..
e211f0c
100644
(file)
--- a/
contrib/asdf-module.mk
+++ b/
contrib/asdf-module.mk
@@
-1,4
+1,3
@@
-
# We need to extend flags to the C compiler and the linker
# here. sb-posix, sb-grovel, and sb-bsd-sockets depends upon these
# being set on x86_64. Setting these in their Makefiles is not
# We need to extend flags to the C compiler and the linker
# here. sb-posix, sb-grovel, and sb-bsd-sockets depends upon these
# being set on x86_64. Setting these in their Makefiles is not
@@
-7,6
+6,9
@@
# ones as dependencies.
UNAME:=$(shell uname -s)
# ones as dependencies.
UNAME:=$(shell uname -s)
+DEST=$(SBCL_PWD)/obj/sbcl-home/contrib/
+FASL=$(DEST)/$(SYSTEM).fasl
+ASD=$(DEST)/$(SYSTEM).asd
ifeq (SunOS,$(UNAME))
EXTRA_CFLAGS=-D_XOPEN_SOURCE=500 -D__EXTENSIONS__
ifeq (SunOS,$(UNAME))
EXTRA_CFLAGS=-D_XOPEN_SOURCE=500 -D__EXTENSIONS__
@@
-27,18
+29,21
@@
endif
export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
-all: $(EXTRA_ALL_TARGETS)
+all: $(FASL) $(ASD) $(EXTRA_ALL_TARGETS)
+
+$(FASL)::
$(MAKE) -C ../asdf
$(MAKE) -C ../asdf
- $(SBCL) --eval '(defvar *system* "$(SYSTEM)")' --load ../asdf-stub.lisp --eval '(exit)'
+ $(SBCL) --load ../asdf-stub.lisp \
+ --eval '(asdf::build-asdf-contrib "$(SYSTEM)")'
+
+$(ASD)::
+ echo "(defsystem :$(SYSTEM) :class require-system)" > $@
-test: all
- echo "(pushnew :sb-testing-contrib *features*)" \
- "(asdf:operate (quote asdf:load-op) :$(SYSTEM))" \
- "(asdf:operate (quote asdf:test-op) :$(SYSTEM))" | \
- $(SBCL) --eval '(load "../asdf/asdf")'
+test: $(FASL) $(ASD)
+ $(SBCL) --load ../asdf-stub.lisp \
+ --eval '(asdf::test-asdf-contrib "$(SYSTEM)")'
# KLUDGE: There seems to be no portable way to tell tar to not to
# preserve owner, so chown after installing for the current user.
install: $(EXTRA_INSTALL_TARGETS)
# KLUDGE: There seems to be no portable way to tell tar to not to
# preserve owner, so chown after installing for the current user.
install: $(EXTRA_INSTALL_TARGETS)
- tar cf - . | ( cd "$(BUILD_ROOT)$(INSTALL_DIR)" && tar xpvf - )
- find "$(BUILD_ROOT)$(INSTALL_DIR)" -exec chown `id -u`:`id -g` {} \;
+ cp $(FASL) $(ASD) "$(BUILD_ROOT)$(INSTALL_DIR)"