diff options
author | Theodore Ts'o <tytso@mit.edu> | 2008-01-01 12:41:35 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2008-01-01 12:41:35 -0500 |
commit | fef2b38d8e5b475655771f8208265a8fa9246601 (patch) | |
tree | b56a98ef4067cdaa7bc9e1cf502ab0352cf9b851 /lib/ss | |
parent | b689b8dd14e69c652d2c8211bdef3effe81cfd65 (diff) | |
parent | 7132d48d83f79992773b6d9f1cace8d96366f08b (diff) | |
download | e2fsprogs-fef2b38d8e5b475655771f8208265a8fa9246601.tar.gz |
Merge branch 'maint' into next
Conflicts:
configure
debian/rules
e2fsck/swapfs.c
lib/ext2fs/ext2_fs.h
Diffstat (limited to 'lib/ss')
-rw-r--r-- | lib/ss/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in index aa4f94be..23b5f604 100644 --- a/lib/ss/Makefile.in +++ b/lib/ss/Makefile.in @@ -163,7 +163,7 @@ uninstall:: $(DESTDIR)$(man1dir)/mk_cmds.1 $(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss -test_ss: test_ss.o test_cmd.o $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) +test_ss: test_ss.o test_cmd.o $(LIBSS) $(LIBCOM_ERR) @echo " LD $@" @$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \ $(LIBSS) $(LIBCOM_ERR) |