--- cduce/trunk/Makefile.distrib	2007/07/11 13:01:15	1956
+++ cduce/trunk/Makefile.distrib	2008/04/15 21:08:29	3998
@@ -16,7 +16,7 @@
 all: cduce_lib.cmxa
 endif
 
-PACKAGES = camlp4 ulex pcre num netstring cgi
+PACKAGES = camlp4 ulex pcre num netstring 
 
 # Call make with VERBOSE=true to get a trace of commands
 
@@ -59,6 +59,7 @@
 ifeq ($(INTERFACE), true)
 	OPT += -passopt -i
 endif
+
 OCAMLFIND = ocamlfind
 CAMLC = $(OCAMLFIND) $(CAMLC_P) $(OPT) -package "$(PACKAGES)"
 CAMLOPT = $(OCAMLFIND) $(CAMLOPT_P) $(OPT) -package "$(PACKAGES)"
@@ -72,6 +73,9 @@
   ifeq ($(NATDYNLINK), true)
     LINK += dynlink.cmxa
   endif
+  ifeq ($(ADDICON), true)
+    LINK += cduceres.o
+  endif
   LINK += camlp4lib.cmxa
   SYNTAX += -symbol ocaml_compiler=\"native\"
 else
@@ -131,7 +135,7 @@
 
 # Source directories 
 
-DIRS = misc parser schema typing types compile runtime driver query ocamliface
+DIRS = misc parser schema typing types compile runtime driver query ocamliface win32
 CLEAN_DIRS = $(DIRS) tools tests
 
 # Objects to build
@@ -202,16 +206,24 @@
 endif
 
 ifeq ($(PXP),true)
-  OBJECTS += runtime/cduce_pxp.cmo
-  PACKAGES += $(PXP_PACK)
-  ALL_TARGET += dtd2cduce
-  INSTALL_BINARIES += dtd2cduce
+    OBJECTS += runtime/cduce_pxp.cmo
+    PACKAGES += $(PXP_PACK)
+    ifeq ($(CGI),true)
+      OBJECTS += runtime/cduce_pxp.cmo
+      PACKAGES += netcgi1
+      ALL_TARGET += dtd2cduce
+      INSTALL_BINARIES += dtd2cduce
+  endif
 endif
+
 ifeq ($(EXPAT), true)
   OBJECTS += runtime/cduce_expat.cmo
   PACKAGES += expat
 endif
 
+ifeq ($(ADDICON), true)
+  OBJECTS += cduceres.o
+endif
 
 all: $(ALL_TARGET)
 
@@ -253,7 +265,7 @@
 
 dtd2cduce: tools/dtd2cduce.ml
 	@echo "Build $@"
-	$(HIDE)$(OCAMLFIND) $(CAML) -o $@ -package "$(PXP_PACK) cgi" -linkpkg $^
+	$(HIDE)$(OCAMLFIND) $(CAML) -o $@ -package "$(PXP_PACK) netcgi1" -linkpkg $^
 
 .PHONY: compute_depend
 compute_depend: $(DEPEND_OCAMLDEP)
@@ -304,6 +316,9 @@
 
 include depend
 
+cduceres.o: win32/cduce.rc win32/cduce_logo-bw.ico
+	(cd win32; windres -i cduce.rc -o cduceres.o; mv cduceres.o ..)
+
 # Documentation
 
 doc: cduce web/site.cdo