X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=1949724bbbf9f27d806bc4fa80330aba41181b2d;hb=b2a3f97cd00de629e098a9d9a802cfc2669d8c91;hp=09cb8068589cbbdf9b9dd14e96634be119a71ff9;hpb=a31f6789da91826a6b4e54ba82f84024d8f6822e;p=guestfs-browser.git

diff --git a/Makefile.am b/Makefile.am
index 09cb806..1949724 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = \
 	$(SOURCES) \
 	HACKING \
 	Throbber.png Throbber.gif \
+	config.ml.in \
 	.gitignore \
 	guestfs-browser.pod \
 	guestfs-browser.1 \
@@ -40,7 +41,6 @@ SOURCES = \
 	cmdline.mli \
 	cmdline.ml \
 	config.mli \
-	config.ml \
 	deviceSet.mli \
 	deviceSet.ml \
 	filetree.mli \
@@ -48,6 +48,8 @@ SOURCES = \
 	filetree_markup.mli \
 	filetree_markup.ml \
 	main.ml \
+	menu_about.mli \
+	menu_about.ml \
 	menu_open_disk.mli \
 	menu_open_disk.ml \
 	menu_open_uri.mli \
@@ -68,6 +70,8 @@ SOURCES = \
 	op_download_file.ml \
 	op_file_information.mli \
 	op_file_information.ml \
+	op_file_properties.mli \
+	op_file_properties.ml \
 	op_inspection_dialog.mli \
 	op_inspection_dialog.ml \
 	op_view_file.mli \
@@ -84,6 +88,9 @@ SOURCES = \
 	window.mli \
 	window.ml
 
+BUILT_SOURCES = \
+	config.ml
+
 # Note this list must be in dependency order.
 OBJECTS = \
 	config.cmo \
@@ -104,11 +111,13 @@ OBJECTS = \
 	op_download_dir_tarball.cmo \
 	op_download_file.cmo \
 	op_file_information.cmo \
+	op_file_properties.cmo \
 	op_inspection_dialog.cmo \
 	op_view_file.cmo \
+	window.cmo \
 	menu_open_uri.cmo \
 	menu_open_disk.cmo \
-	window.cmo \
+	menu_about.cmo \
 	main.cmo
 
 XOBJECTS = $(OBJECTS:.cmo=.cmx)
@@ -116,10 +125,10 @@ XOBJECTS = $(OBJECTS:.cmo=.cmx)
 bin_SCRIPTS = guestfs-browser
 
 OCAMLPACKAGES = \
-	-package libvirt,guestfs,hivex,lablgtk2,extlib,xml-light,camomile,threads,bitstring,bitstring.syntax -syntax bitstring
+	-package libvirt,guestfs,hivex,lablgtk2,lablgtk2.auto-init,extlib,xml-light,calendar,camomile,threads,bitstring,bitstring.syntax -syntax bitstring
 OCAMLCFLAGS = \
 	-g \
-	-warn-error CDEFLMPSUVYZX \
+	-warn-error CDEFLMPSUVYZX-3 \
 	-thread \
 	$(OCAMLPACKAGES) \
 	-predicates threads
@@ -135,14 +144,12 @@ OCAMLDOCFLAGS = \
 if HAVE_OCAMLOPT
 guestfs-browser: $(XOBJECTS)
 	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
-	  -predicates init,threads \
-	  -linkpkg gtkThread.cmx \
+	  -linkpkg \
 	  $^ -o $@
 else
 guestfs-browser: $(OBJECTS)
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \
-	  -predicates init,threads \
-	  -linkpkg gtkThread.cmo \
+	  -linkpkg \
 	  $^ -o $@
 endif
 
@@ -171,11 +178,25 @@ icon_DATA = guestfs-browser.svg guestfs-browser-large.png guestfs-browser.png
 desktopdir = $(datadir)/applications
 desktop_DATA = guestfs-browser.desktop
 
-guestfs-browser.desktop: guestfs-browser.desktop.in
-	$(SED) "s,\@icondir\@,$(icondir),g" < $< > $@
+guestfs-browser.desktop: guestfs-browser.desktop.in Makefile
+	$(SED) "s,\@icondir\@,$(icondir),g" < $< > $@-t
+	mv $@-t $@
 
 TESTS += test-desktop-file-validate.sh
 
+# Config.  Can't use autoconf to build this because we want
+# to embed the true icondir path.
+config.ml: config.ml.in Makefile
+	< $< \
+	$(SED) \
+	  -e "s,\@PACKAGE_NAME\@,$(PACKAGE_NAME),g" \
+	  -e "s,\@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g" \
+	  -e "s,\@HIVEXREGEDIT\@,$(HIVEXREGEDIT),g" \
+	  -e "s,\@OPENER\@,$(OPENER),g" \
+	  -e "s,\@icondir\@,$(icondir),g" \
+	  > $@-t
+	mv $@-t $@
+
 # Man page.
 man_MANS = guestfs-browser.1
 
@@ -223,10 +244,15 @@ depend: .depend
 
 .depend: $(wildcard *.mli) $(wildcard *.ml)
 	$(OCAMLFIND) ocamldep $(OCAMLPACKAGES) $^ | \
+	  $(SED) -e 's/ *$$//' | \
+	  $(SED) -e 's/[ \t]:/:/' | \
 	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
-	  sort > $@-t
+	  LANG=C sort > $@-t
 	mv $@-t $@
 
 include .depend
 
 .PHONY: depend docs
+
+# The dependencies aren't safe for parallel make (XXX fixme).
+.NOTPARALLEL: