X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=c1dd14192d28502f9e8f7be1f27c8036c1a17d96;hb=43c88e258fcbf22e1c0b2bdb15f6b0ba9f681548;hp=8a0be7ca8cf3da15175dcb851dae1d3a20e18371;hpb=298cc147ee0015df2128f9efe0402004e9820b9c;p=guestfs-browser.git diff --git a/Makefile.am b/Makefile.am index 8a0be7c..c1dd141 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,7 +125,7 @@ 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,extlib,xml-light,calendar,camomile,threads,bitstring,bitstring.syntax -syntax bitstring OCAMLCFLAGS = \ -g \ -warn-error CDEFLMPSUVYZX \ @@ -171,11 +180,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 @@ -222,10 +245,11 @@ docs: depend: .depend .depend: $(wildcard *.mli) $(wildcard *.ml) - rm -f $@ $@-t $(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