Add Augeas.defnode

[ocaml-augeas.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index eacd01d..8864725 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,9 +26,10 @@ OCAMLDOC     = @OCAMLDOC@
 INSTALL                = @INSTALL@
 
 CC             = @CC@
-CFLAGS         = @CFLAGS@ -fPIC -I$(shell ocamlc -where) -Wall -Werror
+CFLAGS         = @CFLAGS@ @AUGEAS_CFLAGS@ @LIBXML2_CFLAGS@ \
+                 -fPIC -I$(shell ocamlc -where) -Wall -Werror
 LDFLAGS                = @LDFLAGS@
-LIBS           = @LIBS@
+LIBS           = @AUGEAS_LIBS@ @LIBXML2_LIBS@ @LIBS@
 
 OCAMLCFLAGS    = -g
 OCAMLCPACKAGES =
@@ -41,15 +42,15 @@ export LIBRARY_PATH = .
 
 all:   mlaugeas.cma mlaugeas.cmxa test_augeas
 
-mlaugeas.cma: augeas_c.o augeas.cmo
+mlaugeas.cma: augeas-c.o augeas.cmo
        ocamlmklib $(LDFLAGS) $(LIBS) -o mlaugeas $^
 
-mlaugeas.cmxa: augeas_c.o augeas.cmx
+mlaugeas.cmxa: augeas-c.o augeas.cmx
        ocamlmklib $(LDFLAGS) $(LIBS) -o mlaugeas $^
 
 # Test program.
 
-test_augeas: test_augeas.cmo test_root
+test_augeas: test_augeas.cmo test_root mlaugeas.cma
        $(OCAMLFIND) ocamlc -o $@ mlaugeas.cma $<
 
 test_root:
@@ -58,6 +59,9 @@ test_root:
        mkdir $@/etc
        cp /etc/hosts $@/etc/
 
+check:
+       LD_LIBRARY_PATH=. ./test_augeas
+
 # Clean.
 
 clean:
@@ -107,13 +111,14 @@ dist:
        mkdir $(PACKAGE)-$(VERSION)
        tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
        $(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
+       $(INSTALL) -m 0644 aclocal.m4 $(PACKAGE)-$(VERSION)/
        $(INSTALL) -m 0644 config.h.in $(PACKAGE)-$(VERSION)/
        tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
        rm -rf $(PACKAGE)-$(VERSION)
        ls -l $(PACKAGE)-$(VERSION).tar.gz
 
 check-manifest:
-       hg manifest | sort > .check-manifest; \
+       git ls-files | sort > .check-manifest; \
        sort MANIFEST > .orig-manifest; \
        diff -u .orig-manifest .check-manifest; rv=$$?; \
        rm -f .orig-manifest .check-manifest; \