shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

configure: Allow C++ components.

Browse Source
This commit is contained in:
Petr Rockai 2014-06-08 18:23:47 +02:00
parent f476655fee
commit bf1f22cc99
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -69,6 +69,7 @@ dnl -- Checks for programs.
AC_PROG_SED AC_PROG_SED
AC_PROG_AWK AC_PROG_AWK
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX
dnl probably no longer needed in 2008, but... dnl probably no longer needed in 2008, but...
AC_PROG_GCC_TRADITIONAL AC_PROG_GCC_TRADITIONAL

10
make.tmpl.in
View File

@ -106,6 +106,7 @@ DEFAULT_MANGLING = @MANGLING@
# Setup vpath search paths for some suffixes # Setup vpath search paths for some suffixes
vpath %.c $(srcdir) vpath %.c $(srcdir)
vpath %.cpp $(srcdir)
vpath %.in $(srcdir) vpath %.in $(srcdir)
vpath %.po $(srcdir) vpath %.po $(srcdir)
vpath %.exported_symbols $(srcdir) vpath %.exported_symbols $(srcdir)
@ -136,7 +137,7 @@ INSTALL_ROOT_DIR = $(INSTALL) -m 700 -d
INSTALL_ROOT_DATA = $(INSTALL) -m 600 INSTALL_ROOT_DATA = $(INSTALL) -m 600
INSTALL_SCRIPT = $(INSTALL) -p $(M_INSTALL_PROGRAM) INSTALL_SCRIPT = $(INSTALL) -p $(M_INSTALL_PROGRAM)
.SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib .SUFFIXES: .c .cpp .d .o .so .a .po .pot .mo .dylib
WFLAGS += -Wall -Wundef -Wshadow -Wcast-align -Wwrite-strings \ WFLAGS += -Wall -Wundef -Wshadow -Wcast-align -Wwrite-strings \
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs \ -Wmissing-prototypes -Wmissing-declarations -Wnested-externs \
@ -239,7 +240,7 @@ INC_LNS = $(top_builddir)/include/.symlinks_created
DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \ DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \
$(top_builddir)/Makefile $(INC_LNS) $(top_builddir)/Makefile $(INC_LNS)
OBJECTS = $(SOURCES:%.c=%.o) OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o)
POTFILES = $(SOURCES:%.c=%.pot) POTFILES = $(SOURCES:%.c=%.pot)
.PHONY: all pofile distclean clean cleandir cflow device-mapper .PHONY: all pofile distclean clean cleandir cflow device-mapper
@ -366,6 +367,9 @@ $(TARGETS): $(OBJECTS)
%.o: %.c %.o: %.c
$(CC) -c $(INCLUDES) $(DEFS) $(WFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ $(CC) -c $(INCLUDES) $(DEFS) $(WFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
%.o: %.cpp
$(CXX) -c $(INCLUDES) $(DEFS) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
%.pot: %.c Makefile %.pot: %.c Makefile
$(CC) -E $(INCLUDES) -include $(top_builddir)/include/pogen.h \ $(CC) -E $(INCLUDES) -include $(top_builddir)/include/pogen.h \
$(DEFS) $(WFLAGS) $(CFLAGS) $< > $@ $(DEFS) $(WFLAGS) $(CFLAGS) $< > $@
@ -454,7 +458,7 @@ distclean: cleandir $(SUBDIRS.distclean)
ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \ ifeq (,$(findstring $(MAKECMDGOALS),cscope.out cflow clean distclean lcov \
help check check_local check_cluster check_lvmetad)) help check check_local check_cluster check_lvmetad))
ifdef SOURCES ifdef SOURCES
-include $(SOURCES:.c=.d) -include $(SOURCES:.c=.d) $(CXXSOURCES:.cpp=.d)
endif endif
ifdef SOURCES2 ifdef SOURCES2
-include $(SOURCES2:.c=.d) -include $(SOURCES2:.c=.d)