diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-03-19 16:21:39 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-03-19 16:21:39 +0000 |
| commit | 98c2b2bd1ee52edddff2a6471e9616178c8d333c (patch) | |
| tree | 199526e6a926c89937bd8dd93a45dff60fc752cf | |
| parent | ac23908a0df6302e568b79ffb968442a5c742923 (diff) | |
| download | xen-98c2b2bd1ee52edddff2a6471e9616178c8d333c.tar.gz xen-98c2b2bd1ee52edddff2a6471e9616178c8d333c.tar.bz2 xen-98c2b2bd1ee52edddff2a6471e9616178c8d333c.zip | |
stubdom: add C example target
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
| -rw-r--r-- | extras/mini-os/Makefile | 7 | ||||
| -rw-r--r-- | stubdom/Makefile | 14 | ||||
| -rw-r--r-- | stubdom/c/Makefile | 9 | ||||
| -rw-r--r-- | stubdom/c/main.c | 6 |
4 files changed, 34 insertions, 2 deletions
diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 4811f0dbfd..7cc4d0222e 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -88,6 +88,11 @@ OBJS += $(QEMUDIR)/i386-dm-stubdom/qemu.a $(QEMUDIR)/i386-dm-stubdom/libqemu.a CFLAGS += -DCONFIG_QEMU endif +ifneq ($(CDIR),) +OBJS += $(CDIR)/main.a +LDLIBS += +endif + ifeq ($(libc),y) LDLIBS += -L$(XEN_ROOT)/stubdom/libxc -lxenctrl -lxenguest LDLIBS += -lpci @@ -95,7 +100,7 @@ LDLIBS += -lz LDLIBS += -lc endif -ifneq ($(caml)-$(qemu)-$(lwip),--y) +ifneq ($(caml)-$(qemu)-$(CDIR)-$(lwip),---y) OBJS := $(filter-out daytime.o, $(OBJS)) endif diff --git a/stubdom/Makefile b/stubdom/Makefile index 7fdcdb22c0..67a76aedff 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -201,6 +201,14 @@ ioemu: cross-zlib cross-libpci mk-symlinks libxc caml: $(MAKE) -C $@ +### +# C +### + +.PHONY: c +c: + $(MAKE) -C $@ + ######## # minios ######## @@ -211,7 +219,11 @@ qemu-stubdom: mk-symlinks lwip-cvs libxc ioemu .PHONY: caml-stubdom caml-stubdom: mk-symlinks lwip-cvs libxc cross-libpci caml - $(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwia-cvs CAMLDIR=$(CURDIR)/caml + $(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwip-cvs CAMLDIR=$(CURDIR)/caml + +.PHONY: c-stubdom +c-stubdom: mk-symlinks lwip-cvs libxc cross-libpci c + $(MAKE) -C mini-os LWIPDIR=$(CURDIR)/lwip-cvs CDIR=$(CURDIR)/c ######### # install diff --git a/stubdom/c/Makefile b/stubdom/c/Makefile new file mode 100644 index 0000000000..6262095b66 --- /dev/null +++ b/stubdom/c/Makefile @@ -0,0 +1,9 @@ +XEN_ROOT = ../.. + +include $(XEN_ROOT)/Config.mk + +main.a: main.o + $(AR) cr $@ $^ + +clean: + rm -f *.a *.o diff --git a/stubdom/c/main.c b/stubdom/c/main.c new file mode 100644 index 0000000000..12288a6292 --- /dev/null +++ b/stubdom/c/main.c @@ -0,0 +1,6 @@ +#include <stdio.h> +int main(void) { + sleep(2); + printf("Hello, world!\n"); + return 0; +} |