Merge branch 'master' of github.com:jthornber/thin-provisioning-tools into era

Conflicts:
	Makefile.in
This commit is contained in:
Joe Thornber
2014-01-31 22:35:04 +00:00
6 changed files with 274 additions and 1 deletions

View File

@@ -24,6 +24,7 @@ PROGRAMS=\
cache_dump \
cache_restore \
cache_repair \
cache_metadata_size \
\
era_check \
era_dump \
@@ -298,6 +299,10 @@ cache_restore: $(CACHE_RESTORE_OBJECTS) caching/cache_restore.o
@echo " [LD] $@"
$(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
cache_metadata_size: caching/cache_metadata_size.o
@echo " [LD] $@"
$(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
#----------------------------------------------------------------
# Era tools