X-Git-Url: http://git.annexia.org/?p=virt-mem.git;a=blobdiff_plain;f=Makefile.in;h=cca638845d968cc7e4082328ee305efbd974905b;hp=27a7ea9a0dd3553d4a2251408463b8793d35b43d;hb=b70c967911e197b74d6d7ad98e3df9240d82572f;hpb=026f218e673c2a20220ae37791aa41e8d58c9f8b

diff --git a/Makefile.in b/Makefile.in
index 27a7ea9..cca6388 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,12 +20,17 @@ PACKAGE		= @PACKAGE_NAME@
 VERSION		= @PACKAGE_VERSION@
 
 INSTALL		= @INSTALL@
+MKDIR_P		= @MKDIR_P@
 datarootdir	= @datarootdir@
 mandir		= @mandir@
 
 HAVE_PERLDOC    = @HAVE_PERLDOC@
 
-TOOLS		= uname dmesg
+TOOLS		= uname dmesg ps
+export TOOLS
+
+SUBDIRS_NOT_PO	= lib $(TOOLS) mem
+SUBDIRS		= $(SUBDIRS_NOT_PO) po
 
 ifeq ($(HAVE_PERLDOC),perldoc)
 MANPAGES        = virt-mem.1 $(TOOLS:%=virt-%.1)
@@ -35,39 +40,38 @@ endif
 TARGETS		= $(MANPAGES) $(TEXTMANPAGES)
 
 all: $(TARGETS)
-	for d in lib $(TOOLS) po; do \
+	for d in $(SUBDIRS); do \
 	  $(MAKE) -C $$d $@; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
 install: install-man
-	for d in lib $(TOOLS) po; do \
+	for d in $(SUBDIRS); do \
 	  $(MAKE) -C $$d $@; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
 depend doc:
-	for d in lib $(TOOLS); do \
+	for d in $(SUBDIRS_NOT_PO); do \
 	  $(MAKE) -C $$d $@; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
 clean:
-	for d in . lib $(TOOLS); do \
+	for d in . $(SUBDIRS); do \
 	  (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a \
 	    *.so *.opt *~ *.dll *.exe *.annot core); \
 	done
-	for d in po; do \
-	  (cd $$d; rm -f *~); \
-	done
 	rm -f uname/virt-uname
 	rm -f dmesg/virt-dmesg
+	rm -f ps/virt-ps
+	rm -f mem/virt-mem
 
 distclean: clean
 	rm -f config.h config.log config.status configure
 	rm -rf autom4te.cache
 	rm -f Makefile
-	rm -f virt-df/Makefile
+	rm -f */Makefile
 
 # Manual page.
 
@@ -83,6 +87,7 @@ virt-%.1:
 	echo '.so man1/virt-mem.1' > $@
 
 install-man:
+	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -m 0644 $(MANPAGES) $(DESTDIR)$(mandir)/man1/
 
 else
@@ -93,12 +98,14 @@ endif
 
 # Distribution.
 
-dist: ChangeLog
+dist:
 	$(MAKE) check-manifest
 	rm -rf $(PACKAGE)-$(VERSION)
 	mkdir $(PACKAGE)-$(VERSION)
 	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
+	hg log --style changelog > $(PACKAGE)-$(VERSION)/ChangeLog
 	$(INSTALL) -m 0755 configure $(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
@@ -110,9 +117,5 @@ check-manifest:
 	rm -f .orig-manifest .check-manifest; \
 	exit $$rv
 
-ChangeLog: force
-	hg log --style changelog > $@.new
-	mv $@.new $@
-
 .PHONY: all opt depend install clean distclean configure dist check-manifest \
 	release release_stage_2 release_stage_3 force
\ No newline at end of file