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

- fix configure.h.in error and .PHONY

Browse Source 
- add all target to unit-tests/Makefile.in to make it actually build
This commit is contained in:
Heinz Mauelshagen 2011-12-21 11:31:56 +01:00
parent f7c6cabf33
commit 73876ff59d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -16,7 +16,7 @@
# with thin-provisioning-tools. If not, see # with thin-provisioning-tools. If not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
.PHONEY: all .PHONY: all
PROGRAMS=\ PROGRAMS=\
thin_repair \ thin_repair \
@ -71,7 +71,7 @@ INSTALL_DIR = $(INSTALL) -m 755 -d
INSTALL_PROGRAM = $(INSTALL) -m 755 $(STRIP) INSTALL_PROGRAM = $(INSTALL) -m 755 $(STRIP)
INSTALL_DATA = $(INSTALL) -p -m 644 INSTALL_DATA = $(INSTALL) -p -m 644
.PHONEY: test-programs .PHONY: test-programs
test-programs: $(TEST_PROGRAMS) test-programs: $(TEST_PROGRAMS)
@ -114,13 +114,12 @@ thin_restore: $(THIN_RESTORE_OBJECTS) thin_restore.o
thin_repair: $(THIN_REPAIR_OBJECTS) thin_repair.o thin_repair: $(THIN_REPAIR_OBJECTS) thin_repair.o
$(CXX) $(CXXFLAGS) -o $@ $+ $(LIBS) $(CXX) $(CXXFLAGS) -o $@ $+ $(LIBS)
.PHONEY: clean distclean
clean: clean:
$(RM) *.o unit-tests/*.o *.d unit-tests/*.d $(TEST_PROGRAMS) $(PROGRAMS) $(RM) *.o unit-tests/*.o *.d unit-tests/*.d $(TEST_PROGRAMS) $(PROGRAMS)
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
.PHONY: clean distclean
.PHONEY: install
install: $(PROGRAMS) install: $(PROGRAMS)
$(INSTALL_DIR) $(BINDIR) $(INSTALL_DIR) $(BINDIR)
$(INSTALL_PROGRAM) thin_repair $(BINDIR)/thin_repair $(INSTALL_PROGRAM) thin_repair $(BINDIR)/thin_repair
@ -130,6 +129,7 @@ install: $(PROGRAMS)
$(INSTALL_DATA) man8/thin_repair.8 $(MANPATH)/man8/thin_repair.8 $(INSTALL_DATA) man8/thin_repair.8 $(MANPATH)/man8/thin_repair.8
$(INSTALL_DATA) man8/thin_dump.8 $(MANPATH)/man8/thin_dump.8 $(INSTALL_DATA) man8/thin_dump.8 $(MANPATH)/man8/thin_dump.8
$(INSTALL_DATA) man8/thin_restore.8 $(MANPATH)/man8/thin_restore.8 $(INSTALL_DATA) man8/thin_restore.8 $(MANPATH)/man8/thin_restore.8
.PHONY: install
ifeq (,$(findstring $(MAKECMDGOALS),clean distclean)) ifeq (,$(findstring $(MAKECMDGOALS),clean distclean))
-include $(subst .cc,.d,$(SOURCE)) -include $(subst .cc,.d,$(SOURCE))

2
configure.in
View File

@ -23,7 +23,7 @@ AC_PREREQ(2.61)
################################################################ ################################################################
dnl -- Process this file with autoconf to produce a configure script. dnl -- Process this file with autoconf to produce a configure script.
AC_INIT AC_INIT
AC_CONFIG_HEADERS([configure.h]) # AC_CONFIG_HEADERS([configure.h])
################################################################################ ################################################################################
dnl -- Setup the directory where autoconf has auxilary files dnl -- Setup the directory where autoconf has auxilary files