X-Git-Url: http://git.annexia.org/?p=guestfs-browser.git;a=blobdiff_plain;f=Makefile.am;h=36bbe1cbcb10975b8431c08a666ed66c9674be20;hp=d76c28a2b333fd71391791139bce3ad577872b7d;hb=7dc8ab0a896859c51973982c607f92a215a435cc;hpb=ef2ecdec4f01f57342610f68e5b21a4a65296e6b

diff --git a/Makefile.am b/Makefile.am
index d76c28a..36bbe1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,20 +66,22 @@ SOURCES = \
 
 # Note this list must be in dependency order.
 OBJECTS = \
-	config.cmx \
-	throbber.cmx \
-	utils.cmx \
-	cmdline.cmx \
-	deviceSet.cmx \
-	slave_types.cmx \
-	slave_utils.cmx \
-	slave.cmx \
-	filetree_type.cmx \
-	filetree_markup.cmx \
-	filetree_ops.cmx \
-	filetree.cmx \
-	window.cmx \
-	main.cmx
+	config.cmo \
+	throbber.cmo \
+	utils.cmo \
+	cmdline.cmo \
+	deviceSet.cmo \
+	slave_types.cmo \
+	slave_utils.cmo \
+	slave.cmo \
+	filetree_type.cmo \
+	filetree_markup.cmo \
+	filetree_ops.cmo \
+	filetree.cmo \
+	window.cmo \
+	main.cmo
+
+XOBJECTS = $(OBJECTS:.cmo=.cmx)
 
 bin_SCRIPTS = guestfs-browser
 
@@ -98,11 +100,19 @@ OCAMLDOCFLAGS = \
 	-I +threads \
 	-sort -html
 
-guestfs-browser: $(OBJECTS)
+if HAVE_OCAMLOPT
+guestfs-browser: $(XOBJECTS)
 	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
 	  -predicates init,threads \
 	  -linkpkg gtkThread.cmx \
 	  $^ -o $@
+else
+guestfs-browser: $(OBJECTS)
+	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \
+	  -predicates init,threads \
+	  -linkpkg gtkThread.cmo \
+	  $^ -o $@
+endif
 
 # This file is built.  However gdk_pixbuf_mlsource requires X11 to
 # run, which prevents this from being built in places where an X