X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2FMakefile.am;h=16a29b02b51f093e3e12053a352875a651fe57ff;hp=4215784c6d17e2b1b5c9616198a00e9d8ef52214;hb=43942b08cfbcf91bef29ec532f3d097a8519c982;hpb=85efbc6aa70d522af066a38fd1aae05b790c46d3

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 4215784..16a29b0 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/subdir-rules.mk
 
@@ -57,16 +57,18 @@ EXTRA_DIST = \
 	virt-tar-in.pod \
 	virt-tar-out.pod
 
-# These source files (all related to option parsing) are shared
-# between guestfish and guestmount.  Keep a convenient list here just
-# so we know which ones are shared.  These files must not include
-# other guestfish files.
+# These source files (mostly related to option parsing) are shared
+# between guestfish, guestmount and some other virt tools.  Keep a
+# convenient list here just so we know which ones are shared.  These
+# files must not include other guestfish files.
 SHARED_SOURCE_FILES = \
 	config.c \
 	inspect.c \
 	keys.c \
 	options.h \
 	options.c \
+	progress.h \
+	progress.c \
 	virt.c
 
 guestfish_SOURCES = \
@@ -93,10 +95,8 @@ guestfish_SOURCES = \
 	prep_fs.c \
 	prep_lv.c \
 	prep_boot.c \
-	progress.c \
 	rc.c \
 	reopen.c \
-	rmsd.h \
 	setenv.c \
 	supported.c \
 	tilde.c \
@@ -139,7 +139,7 @@ if HAVE_RPCGEN
 rc_protocol.c: rc_protocol.x
 	rm -f $@-t $@-t2
 	$(RPCGEN) -c -o $@-t $<
-	sed 's,\.\./\.\./fish/,,' < $@-t > $@-t2
+	sed 's,\.\./\(\.\./\)*fish,.,' < $@-t > $@-t2
 	rm $@-t
 	mv $@-t2 $@