Merge

[virt-mem.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 27baac3..03a00fb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,15 +24,11 @@ MKDIR_P             = @MKDIR_P@
 datarootdir    = @datarootdir@
 mandir         = @mandir@
 
-OCAMLDOCFLAGS  = -html -sort -package bitstring,extlib,libvirt -I lib
+OCAMLDOCFLAGS  = -html -sort \
+                 -package bitstring,extlib,libvirt,gettext,xml-light \
+                 -I lib
 OCAMLDOC       = @OCAMLDOC@
-OCAMLDOCFILES  = lib/virt_mem_utils.ml \
-                 lib/virt_mem_mmap.mli \
-                 lib/virt_mem_types.mli \
-                 lib/virt_mem_ksyms.mli \
-                 lib/virt_mem_kallsyms.mli \
-                 lib/virt_mem_utsname.mli \
-                 lib/virt_mem.mli
+OCAMLDOCFILES  = $(wildcard lib/virt_*.mli) lib/kernel.mli
 
 HAVE_PERLDOC    = @HAVE_PERLDOC@
 
@@ -49,7 +45,9 @@ endif
 
 TARGETS                = $(MANPAGES) $(TEXTMANPAGES)
 
-all: $(TARGETS)
+all: byte opt
+
+byte opt: $(TARGETS)
        for d in $(SUBDIRS_NOT_PO); do \
          $(MAKE) -C $$d $@; \
          if [ $$? -ne 0 ]; then exit 1; fi; \
@@ -72,6 +70,7 @@ clean:
          (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a \
            *.so *.opt *~ *.dll *.exe *.annot core); \
        done
+       rm -f lib/test_mmap
        rm -f uname/virt-uname
        rm -f dmesg/virt-dmesg
        rm -f ps/virt-ps
@@ -97,7 +96,7 @@ update-kerneldb:
 # Rebuild the generated kernel struct parsers from the kerneldb.
 
 update-kernel-structs:
-       extract/codegen/kerneldb-to-parser.opt kernels lib
+       extract/codegen/compile-kerneldb.opt kernels lib
 
 # Developer documentation (in html/ subdirectory).