From: Vincent Hanquez Date: Wed, 20 May 2009 18:27:28 +0000 (-0700) Subject: Merge commit 'prashanthm/master' X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b4bb24d705506c994c84c70649c6875a9c9ea40b;p=xenclient%2Ftoolstack.git Merge commit 'prashanthm/master' Conflicts: libs/stdext/Makefile --- b4bb24d705506c994c84c70649c6875a9c9ea40b diff --cc libs/stdext/Makefile index 95d5b9a,9bbe2f3..7c51c71 --- a/libs/stdext/Makefile +++ b/libs/stdext/Makefile @@@ -6,7 -6,7 +6,7 @@@ OCAMLINCLUDE += -I ../uui OCAML_TEST_INC = -I $(shell ocamlfind query oUnit) OCAML_TEST_LIB = $(shell ocamlfind query oUnit)/oUnit.cmxa - OBJS = filenameext stringext hashtblext listext pervasiveext threadext ring qring trie opt unixext bigbuffer vIO varmap -OBJS = filenameext stringext hashtblext listext pervasiveext threadext ring qring trie opt unixext bigbuffer vIO eventloop ++OBJS = filenameext stringext hashtblext listext pervasiveext threadext ring qring trie opt unixext bigbuffer vIO varmap eventloop INTF = $(foreach obj, $(OBJS),$(obj).cmi) LIBS = stdext.cma stdext.cmxa