From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Thu, 5 Jun 2008 18:45:03 +0000 (+0100)
Subject: Remove Windows cruft from when it was lacking ocamlfind.
X-Git-Tag: 0.6.1.1~42
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=152037c075622057349e46a138a17f117d582f2a;hp=211828411d78971dea45864ecd510b69b18d4dc3;p=ocaml-libvirt.git

Remove Windows cruft from when it was lacking ocamlfind.
---

diff --git a/examples/Makefile.in b/examples/Makefile.in
index 75a98eb..6fd8093 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -17,33 +17,23 @@
 
 OCAMLFIND	= @OCAMLFIND@
 
-ifneq ($(OCAMLFIND),)
 OCAMLCPACKAGES	:= -package unix -I ../libvirt
 OCAMLCFLAGS	:= -g
 OCAMLCLIBS	:= -linkpkg
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS	:=
 OCAMLOPTLIBS	:= $(OCAMLCLIBS)
-else
-OCAMLCINCS	:= -I ../libvirt
-OCAMLCFLAGS	:= -g
-OCAMLCLIBS	:= unix.cma
-OCAMLOPTINCS    := $(OCAMLCINCS)
-OCAMLOPTFLAGS   :=
-OCAMLOPTLIBS    := unix.cmxa
-endif
 
 export LIBRARY_PATH=../libvirt
 export LD_LIBRARY_PATH=../libvirt
 
 BYTE_TARGETS	:= list_domains node_info
-OPT_TARGETS	:= list_domains.opt node_info.opt
+OPT_TARGETS	:= $(BYTE_TARGETS:%=%.opt)
 
 all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
-ifneq ($(OCAMLFIND),)
 list_domains: list_domains.cmo
 	$(OCAMLFIND) ocamlc \
 	  $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
@@ -63,27 +53,6 @@ node_info.opt: node_info.cmx
 	$(OCAMLFIND) ocamlopt \
 	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
 	  ../libvirt/mllibvirt.cmxa -o $@ $<
-else
-list_domains: list_domains.cmo
-	$(OCAMLC) \
-	  $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  ../libvirt/mllibvirt.cma -o $@ $<
-
-list_domains.opt: list_domains.cmx
-	$(OCAMLOPT) \
-	  $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  ../libvirt/mllibvirt.cmxa -o $@ $<
-
-node_info: node_info.cmo
-	$(OCAMLC) \
-	  $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  ../libvirt/mllibvirt.cma -o $@ $<
-
-node_info.opt: node_info.cmx
-	$(OCAMLOPT) \
-	  $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  ../libvirt/mllibvirt.cmxa -o $@ $<
-endif
 
 install: