git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: -i option should fail if / is not mountable, but warn about others.
[libguestfs.git]
/
fish
/
Makefile.am
diff --git
a/fish/Makefile.am
b/fish/Makefile.am
index
3be14fa
..
16a29b0
100644
(file)
--- 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
#
# 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
include $(top_srcdir)/subdir-rules.mk
@@
-57,8
+57,8
@@
EXTRA_DIST = \
virt-tar-in.pod \
virt-tar-out.pod
virt-tar-in.pod \
virt-tar-out.pod
-# These source files (
all
related to option parsing) are shared
-# between guestfish, guestmount and some other
C
virt tools. Keep a
+# 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 = \
# convenient list here just so we know which ones are shared. These
# files must not include other guestfish files.
SHARED_SOURCE_FILES = \
@@
-67,6
+67,8
@@
SHARED_SOURCE_FILES = \
keys.c \
options.h \
options.c \
keys.c \
options.h \
options.c \
+ progress.h \
+ progress.c \
virt.c
guestfish_SOURCES = \
virt.c
guestfish_SOURCES = \
@@
-93,10
+95,8
@@
guestfish_SOURCES = \
prep_fs.c \
prep_lv.c \
prep_boot.c \
prep_fs.c \
prep_lv.c \
prep_boot.c \
- progress.c \
rc.c \
reopen.c \
rc.c \
reopen.c \
- rmsd.h \
setenv.c \
supported.c \
tilde.c \
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 $<
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 $@
rm $@-t
mv $@-t2 $@