emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autconf: support build of thin_metadata_size.c

Browse Source
This commit is contained in:
Heinz Mauelshagen 2013-07-15 16:48:36 +02:00
parent 80be0d0f54
commit ed88882007
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile.in
View File

@ -24,7 +24,8 @@ PROGRAMS=\
thin_dump \ thin_dump \
thin_restore \ thin_restore \
thin_repair \ thin_repair \
thin_rmap thin_rmap \
thin_metadata_size
all: $(PROGRAMS) all: $(PROGRAMS)
@ -73,10 +74,15 @@ PROGRAM_SOURCE=\
thin-provisioning/thin_repair.cc \ thin-provisioning/thin_repair.cc \
thin-provisioning/thin_rmap.cc thin-provisioning/thin_rmap.cc
C_PROGRAM_SOURCE=\
thin-provisioning/thin_metadata_size.c
CC:=@CC@
CXX:=@CXX@ CXX:=@CXX@
OBJECTS:=$(subst .cc,.o,$(SOURCE)) OBJECTS:=$(subst .cc,.o,$(SOURCE))
TOP_DIR:=@top_srcdir@ TOP_DIR:=@top_srcdir@
TOP_BUILDDIR:=@top_builddir@ TOP_BUILDDIR:=@top_builddir@
CFLAGS+=-g -Wall -O3
CXXFLAGS+=-std=c++11 -g -Wall -fno-strict-aliasing CXXFLAGS+=-std=c++11 -g -Wall -fno-strict-aliasing
CXXFLAGS+=@CXXOPTIMISE_FLAG@ CXXFLAGS+=@CXXOPTIMISE_FLAG@
CXXFLAGS+=@CXXDEBUG_FLAG@ CXXFLAGS+=@CXXDEBUG_FLAG@
@ -104,6 +110,14 @@ endif
.SUFFIXES: .d .SUFFIXES: .d
%.o: %.c
@echo " [CC] $<"
$(V) $(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
@echo " [DEP] $<"
$(V) $(CC) -MM -MT $(subst .c,.o,$<) $(INCLUDES) $(CFLAGS) $< > $*.$$$$; \
sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \
$(RM) $*.$$$$
%.o: %.cc %.o: %.cc
@echo " [CXX] $<" @echo " [CXX] $<"
$(V) $(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $< $(V) $(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $<
@ -195,6 +209,10 @@ thin_rmap: $(THIN_RMAP_OBJECTS) thin-provisioning/thin_rmap.o
@echo " [LD] $@" @echo " [LD] $@"
$(V) $(CXX) $(CXXFLAGS) -o $@ $+ $(LIBS) $(V) $(CXX) $(CXXFLAGS) -o $@ $+ $(LIBS)
thin_metadata_size: thin-provisioning/thin_metadata_size.o
@echo " [LD] $@"
$(V) $(CC) $(CFLAGS) -o $@ $+ -lm
#---------------------------------------------------------------- #----------------------------------------------------------------
# Cache tools # Cache tools
@ -221,14 +239,16 @@ cache_check: $(CACHE_CHECK_OBJECTS) cache/check.o
DEPEND_FILES=\ DEPEND_FILES=\
$(subst .cc,.d,$(SOURCE)) \ $(subst .cc,.d,$(SOURCE)) \
$(subst .cc,.d,$(TEST_SOURCE)) \ $(subst .cc,.d,$(TEST_SOURCE)) \
$(subst .cc,.d,$(PROGRAM_SOURCE)) $(subst .cc,.d,$(PROGRAM_SOURCE)) \
$(subst .c,.d,$(C_PROGRAM_SOURCE))
.PHONY: clean distclean .PHONY: clean distclean
clean: clean:
find . -name \*.o -delete find . -name \*.o -delete
find . -name \*.gmo -delete find . -name \*.gmo -delete
$(RM) $(DEPEND_FILES) $(TEST_PROGRAMS) $(PROGRAMS) $(GMOCK_OBJECTS) lib/*.a find . -name \*.d -delete
$(RM) $(TEST_PROGRAMS) $(PROGRAMS) $(GMOCK_OBJECTS) lib/*.a
distclean: clean distclean: clean
$(RM) config.cache config.log config.status configure.h version.h Makefile unit-tests/Makefile $(RM) config.cache config.log config.status configure.h version.h Makefile unit-tests/Makefile
@ -240,6 +260,7 @@ install: $(PROGRAMS)
$(INSTALL_PROGRAM) -s thin_repair $(BINDIR) $(INSTALL_PROGRAM) -s thin_repair $(BINDIR)
$(INSTALL_PROGRAM) -s thin_restore $(BINDIR) $(INSTALL_PROGRAM) -s thin_restore $(BINDIR)
$(INSTALL_PROGRAM) -s thin_rmap $(BINDIR) $(INSTALL_PROGRAM) -s thin_rmap $(BINDIR)
$(INSTALL_PROGRAM) -s thin_metadata_size $(BINDIR)
$(INSTALL_DIR) $(MANPATH)/man8 $(INSTALL_DIR) $(MANPATH)/man8
$(INSTALL_DATA) man8/thin_check.8 $(MANPATH)/man8 $(INSTALL_DATA) man8/thin_check.8 $(MANPATH)/man8
$(INSTALL_DATA) man8/thin_dump.8 $(MANPATH)/man8 $(INSTALL_DATA) man8/thin_dump.8 $(MANPATH)/man8

1
configure.in
View File

@ -30,6 +30,7 @@ dnl -- Setup the directory where autoconf has auxilary files
AC_CONFIG_AUX_DIR(autoconf) AC_CONFIG_AUX_DIR(autoconf)
AC_CANONICAL_TARGET([]) AC_CANONICAL_TARGET([])
AC_PROG_CXX([g++]) AC_PROG_CXX([g++])
AC_PROG_CC([gcc])
AC_LANG(C++) AC_LANG(C++)
################################################################ ################################################################

1
thin-provisioning/thin_metadata_size.c
View File

@ -190,7 +190,6 @@ static void printf_precision(double r, int full, char *unit_str)
{ {
double rtrunc = truncl(r); double rtrunc = truncl(r);
/* FIXME: correct output */
if (full) if (full)
printf("%s - estimated metadata area size is ", prg); printf("%s - estimated metadata area size is ", prg);

0
thin-provisioning/thin_metadata_size → thin-provisioning/thin_metadata_size.rb
View File