Permalink
Browse files

Makefiles, misc

  • Loading branch information...
1 parent ca55e66 commit dbdffae01e8c2fa73d0dd4d0f0516f1096e30de1 @aryx aryx committed Feb 24, 2011
Showing with 11 additions and 5 deletions.
  1. +7 −3 Makefile
  2. +1 −1 commons/Makefile
  3. +1 −1 commons/lib-json/Makefile
  4. +2 −0 external/ocamlnet/netstring/Makefile.def
View
@@ -121,9 +121,13 @@ THRIFTDIR=external/ocamlthrift
# could be under some ifeq($(FEATURE_WEB))
OCAMLNETDIR=external/ocamlnet
-OCAMLNETINCLUDE=external/ocamlnet/netsys
-OCAMLNETCMA=external/ocamlnet/netsys/netsys.cma \
- external/ocamlnet/netstring/netstring.cma
+OCAMLNETINCLUDE=external/ocamlnet/netsys external/ocamlnet/netstring
+OCAMLNETCMA= \
+ external/ocamlnet/netsys/netsys_oothr.cma \
+ external/ocamlnet/netsys/netsys.cma \
+ external/ocamlnet/netstring/netaccel.cma \
+ external/ocamlnet/netstring/netstring.cma \
+
ifeq ($(FEATURE_GRAPHICS), 1)
#GRAPHICSCMXA=graphics.cmxa
View
@@ -67,7 +67,7 @@ ifeq ($(FEATURE_JSON_BUILTIN_COMMONS),1)
SRC+= \
lib-json/json_type.ml \
lib-json/json_out.ml \
- lib-json/netconversion.ml \
+ lib-json/netconversion2.ml \
lib-json/json_parser.ml \
lib-json/json_lexer.ml \
lib-json/json_in.ml \
@@ -7,7 +7,7 @@
SRC= json_type.ml \
json_out.ml \
- netconversion.ml \
+ netconversion2.ml \
json_parser.ml \
json_lexer.ml \
json_in.ml \
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
OBJECTS = netconst.cmo netstring_pcre.cmo netstring_str.cmo netbuffer.cmo \
netaux.cmo netchannels.cmo netdate.cmo \
netdb.cmo netmappings.cmo netconversion.cmo netulex.cmo \

0 comments on commit dbdffae

Please sign in to comment.