X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=d0aec17f9a20a8ac33bad7281cd7917eaf185e51;hb=20c078bead38fd9e413660d4d8fdc3fd4f76edf7;hp=c1a9f5620d4430b78513a0e377eb02fe1c4a0fb1;hpb=07bceaedef4b02f0dfafca6d2498ead43d00511c;p=virt-top.git

diff --git a/Makefile.in b/Makefile.in
index c1a9f56..d0aec17 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # virt-top
-# Copyright (C) 2007-2008 Red Hat Inc., Richard W.M. Jones
+# Copyright (C) 2007-2014 Red Hat Inc., Richard W.M. Jones
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,39 +22,22 @@ INSTALL		= @INSTALL@
 
 MAKENSIS	= @MAKENSIS@
 
-SUBDIRS		= virt-top
+SUBDIRS		= src
 
 all opt depend install:
-	for d in $(SUBDIRS); do \
-	  $(MAKE) -C $$d $@; \
-	  if [ $$? -ne 0 ]; then exit 1; fi; \
-	done
+	$(MAKE) -C src $@
 
 clean:
 	for d in . $(SUBDIRS); do \
 	  (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *.opt *~ *.dll *.exe core); \
 	done
-	rm -f virt-top/virt-top
+	rm -f src/virt-top
 
 distclean: clean
 	rm -f config.h config.log config.status configure
 	rm -rf autom4te.cache
 	rm -f Makefile
-	rm -f virt-top/Makefile
-
-# Windows installer (requires NSIS).
-
-WININSTALLER := $(PACKAGE)-$(VERSION).exe
-
-ifneq ($(MAKENSIS),)
-wininstaller: $(WININSTALLER)
-
-$(WININSTALLER): wininstaller.nsis all opt
-	"$(MAKENSIS)" \
-	  //DPACKAGE=$(PACKAGE) //DVERSION=$(VERSION) \
-	  //DOUTFILE=$@ $<
-	ls -l $@
-endif
+	rm -f src/Makefile
 
 # Distribution.
 
@@ -64,6 +47,9 @@ dist: ChangeLog
 	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 src/virt-top.1 $(PACKAGE)-$(VERSION)/src/
+	$(INSTALL) -m 0644 src/virt-top.txt $(PACKAGE)-$(VERSION)/src/
 	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
 	rm -rf $(PACKAGE)-$(VERSION)
 	ls -l $(PACKAGE)-$(VERSION).tar.gz
@@ -79,4 +65,4 @@ ChangeLog: $(shell find -type f)
 	./gitlog-to-changelog > $@.new
 	mv $@.new $@
 
-.PHONY: all opt depend install clean distclean force
\ No newline at end of file
+.PHONY: all opt depend install clean distclean force