aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os/Makefile
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-05-26 13:23:18 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-05-26 13:23:18 +0100
commit165bf6f0bdfb5ae16fd768822fc0f28517d2fa34 (patch)
treeb9ac53f608b2b03e4d1cb32a706cfb68425bfa4e /extras/mini-os/Makefile
parent1fa74a12d289d6300667217edf43ffb1c094ca5b (diff)
downloadxen-165bf6f0bdfb5ae16fd768822fc0f28517d2fa34.tar.gz
xen-165bf6f0bdfb5ae16fd768822fc0f28517d2fa34.tar.bz2
xen-165bf6f0bdfb5ae16fd768822fc0f28517d2fa34.zip
[MINIOS] Allows the use of a C library without modifying Mini-OS source files.
From: John Ramsdell Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'extras/mini-os/Makefile')
-rw-r--r--extras/mini-os/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
index 63cd9e8079..e92681c1ab 100644
--- a/extras/mini-os/Makefile
+++ b/extras/mini-os/Makefile
@@ -13,6 +13,7 @@ CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
override CPPFLAGS := -Iinclude $(CPPFLAGS)
ASFLAGS = -D__ASSEMBLY__
+LDLIBS = -L. -lminios
LDFLAGS := -N -T minios-$(TARGET_ARCH).lds
ifeq ($(TARGET_ARCH),x86_32)
@@ -55,11 +56,11 @@ default: $(TARGET)
links:
[ -e include/xen ] || ln -sf ../../../xen/include/public include/xen
-libminios.a: $(OBJS) $(HEAD)
- ar r libminios.a $(HEAD) $(OBJS)
+libminios.a: links $(OBJS) $(HEAD)
+ $(AR) r libminios.a $(HEAD) $(OBJS)
-$(TARGET): links libminios.a $(HEAD)
- $(LD) $(LDFLAGS) $(HEAD) -L. -lminios -o $@.elf
+$(TARGET): libminios.a $(HEAD)
+ $(LD) $(LDFLAGS) $(HEAD) $(LDLIBS) -o $@.elf
gzip -f -9 -c $@.elf >$@.gz
.PHONY: clean