X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=88647258ac66d4dcd4fd90e9eac430a30ccaef41;hb=8d4400eec2d49b540e79f787e1b4b7f90bfa5591;hp=178269e59f61dcac9978bf2158e9003afa5bf89e;hpb=d92842594f602cc60b199b7377862a10798dbb7a;p=ocaml-augeas.git

diff --git a/Makefile.in b/Makefile.in
index 178269e..8864725 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,9 +26,10 @@ OCAMLDOC	= @OCAMLDOC@
 INSTALL		= @INSTALL@
 
 CC		= @CC@
-CFLAGS		= @CFLAGS@ -fPIC -I$(shell ocamlc -where)
+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,21 +42,25 @@ 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:
 	rm -rf $@
 	mkdir $@
-	cp /etc/hosts $@/
+	mkdir $@/etc
+	cp /etc/hosts $@/etc/
+
+check:
+	LD_LIBRARY_PATH=. ./test_augeas
 
 # Clean.
 
@@ -76,7 +81,8 @@ endif
 # Install.
 
 install:
-	ocamlfind install augeas META *.mli *.cmx *.cma *.cmxa *.a *.cmi
+	ocamlfind install augeas \
+	  META *.mli *.cmx *.cma *.cmxa *.a augeas.cmi *.so
 
 # Standard rules.
 
@@ -105,17 +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:
-	@for d in `find -type d -name CVS`; do \
-	b=`dirname $$d`/; \
-	awk -F/ '$$1 != "D" {print $$2}' $$d/Entries | \
-	sed -e "s|^|$$b|" -e "s|^\./||"; \
-	done | 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; \