From mboxrd@z Thu Jan  1 00:00:00 1970
From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Subject: [PATCH] stubdom: add C example target
Date: Wed, 19 Mar 2008 16:18:45 +0000
Message-ID: <20080319161845.GD9372@implementation.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

stubdom: add C example target

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff -r 7d8892a90c90 extras/mini-os/Makefile
--- a/extras/mini-os/Makefile	Wed Mar 19 14:13:17 2008 +0000
+++ b/extras/mini-os/Makefile	Wed Mar 19 16:12:04 2008 +0000
@@ -88,6 +88,11 @@
 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 += -lc
 endif
 
-ifneq ($(caml)-$(qemu)-$(lwip),--y)
+ifneq ($(caml)-$(qemu)-$(CDIR)-$(lwip),---y)
 OBJS := $(filter-out daytime.o, $(OBJS))
 endif
 
--- a/stubdom/Makefile	Wed Mar 19 14:13:17 2008 +0000
+++ b/stubdom/Makefile	Wed Mar 19 16:12:04 2008 +0000
@@ -201,6 +201,14 @@
 caml:
 	$(MAKE) -C $@
 
+###
+# C
+###
+
+.PHONY: c
+c:
+	$(MAKE) -C $@
+
 ########
 # minios
 ########
@@ -211,7 +219,11 @@
 
 .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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stubdom/c/Makefile	Wed Mar 19 16:12:04 2008 +0000
@@ -0,0 +1,9 @@
+XEN_ROOT = ../..
+
+include $(XEN_ROOT)/Config.mk
+
+main.a: main.o
+	$(AR) cr $@ $^
+
+clean:
+	rm -f *.a *.o
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stubdom/c/main.c	Wed Mar 19 16:12:04 2008 +0000
@@ -0,0 +1,6 @@
+#include <stdio.h>
+int main(void) {
+        sleep(2);
+        printf("Hello, world!\n");
+        return 0;
+}