X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=8a0be7ca8cf3da15175dcb851dae1d3a20e18371;hb=298cc147ee0015df2128f9efe0402004e9820b9c;hp=e92a3bbe5ff69e322a3b817a2619900d79343178;hpb=04b7ac2ae61b6b556819d16e45751af6903b9712;p=guestfs-browser.git

diff --git a/Makefile.am b/Makefile.am
index e92a3bb..8a0be7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = \
 	$(SOURCES) \
 	HACKING \
 	Throbber.png Throbber.gif \
-	.gitignore guestfs-browser.spec \
+	.gitignore \
 	guestfs-browser.pod \
 	guestfs-browser.1 \
 	guestfs-browser.desktop.in \
@@ -47,11 +47,31 @@ SOURCES = \
 	filetree.ml \
 	filetree_markup.mli \
 	filetree_markup.ml \
-	filetree_ops.mli \
-	filetree_ops.ml \
-	filetree_type.mli \
-	filetree_type.ml \
 	main.ml \
+	menu_open_disk.mli \
+	menu_open_disk.ml \
+	menu_open_uri.mli \
+	menu_open_uri.ml \
+	op_checksum_file.mli \
+	op_checksum_file.ml \
+	op_copy_regvalue.mli \
+	op_copy_regvalue.ml \
+	op_disk_usage.mli \
+	op_disk_usage.ml \
+	op_download_as_reg.mli \
+	op_download_as_reg.ml \
+	op_download_dir_find0.mli \
+	op_download_dir_find0.ml \
+	op_download_dir_tarball.mli \
+	op_download_dir_tarball.ml \
+	op_download_file.mli \
+	op_download_file.ml \
+	op_file_information.mli \
+	op_file_information.ml \
+	op_inspection_dialog.mli \
+	op_inspection_dialog.ml \
+	op_view_file.mli \
+	op_view_file.ml \
 	slave.mli \
 	slave.ml \
 	slave_types.mli \
@@ -66,20 +86,32 @@ 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_markup.cmo \
+	filetree.cmo \
+	op_checksum_file.cmo \
+	op_copy_regvalue.cmo \
+	op_disk_usage.cmo \
+	op_download_as_reg.cmo \
+	op_download_dir_find0.cmo \
+	op_download_dir_tarball.cmo \
+	op_download_file.cmo \
+	op_file_information.cmo \
+	op_inspection_dialog.cmo \
+	op_view_file.cmo \
+	menu_open_uri.cmo \
+	menu_open_disk.cmo \
+	window.cmo \
+	main.cmo
+
+XOBJECTS = $(OBJECTS:.cmo=.cmx)
 
 bin_SCRIPTS = guestfs-browser
 
@@ -91,18 +123,28 @@ OCAMLCFLAGS = \
 	-thread \
 	$(OCAMLPACKAGES) \
 	-predicates threads
-OCAMLOPTFLAGS = $(OCAMLCFLAGS)
+OCAMLOPTFLAGS = \
+	-ccopt -g \
+	$(OCAMLCFLAGS)
 OCAMLDOCFLAGS = \
 	$(OCAMLPACKAGES) \
 	-predicates threads \
 	-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