From: Enrico Forestieri Date: Fri, 4 May 2007 00:47:24 +0000 (+0000) Subject: Last(?) missing rename: version.C -> version.cpp X-Git-Tag: 1.6.10~9889 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1f3bec86bde8a550f5caf82deaa5fdd48aa8cd9e;p=features.git Last(?) missing rename: version.C -> version.cpp git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18194 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/configure.ac b/configure.ac index 854dc3d0f3..344e48c3be 100644 --- a/configure.ac +++ b/configure.ac @@ -417,7 +417,7 @@ AC_CONFIG_FILES([Makefile m4/Makefile \ sourcedoc/Makefile \ src/client/Makefile \ src/Makefile \ - src/version.C-tmp:src/version.cpp.in \ + src/version.cpp-tmp:src/version.cpp.in \ src/tex2lyx/Makefile \ src/mathed/Makefile \ src/graphics/Makefile \ diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt index e1da833234..18b1bee1fe 100644 --- a/development/cmake/src/CMakeLists.txt +++ b/development/cmake/src/CMakeLists.txt @@ -18,7 +18,7 @@ if(NOT MERGE_FILES) endif(NOT MERGE_FILES) -configure_file(${TOP_SRC_DIR}/src/version.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/version.C) +configure_file(${TOP_SRC_DIR}/src/version.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/version.cpp) file(GLOB lyx_sources ${TOP_SRC_DIR}/src/${LYX_CPP_FILES}) file(GLOB lyx_headers ${TOP_SRC_DIR}/src/${LYX_HPP_FILES}) @@ -41,10 +41,10 @@ lyx_add_msvc_pch(lyx) if(NOT MERGE_FILES) - set(lyx_sources ${lyx_sources} ${CMAKE_CURRENT_BINARY_DIR}/version.C) + set(lyx_sources ${lyx_sources} ${CMAKE_CURRENT_BINARY_DIR}/version.cpp) else(NOT MERGE_FILES) lyx_const_touched_files(_allinone lyx_sources) - set(lyx_sources ${_allinone_files} ${CMAKE_CURRENT_BINARY_DIR}/version.C + set(lyx_sources ${_allinone_files} ${CMAKE_CURRENT_BINARY_DIR}/version.cpp ) endif(NOT MERGE_FILES) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 23b9753f83..222ec3b086 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -372,7 +372,7 @@ env.AppendUnique(LIBPATH = ['$LOCALLIBPATH']) # full path name is used to build msvs project files # and to replace TOP_SRCDIR in package.C env['TOP_SRCDIR'] = Dir(top_src_dir).abspath -# needed by src/version.cpp.in => src/version.C +# needed by src/version.cpp.in => src/version.cpp env['PACKAGE_VERSION'] = package_version env['LYX_DATE'] = time.asctime() diff --git a/src/Makefile.am b/src/Makefile.am index d481460628..64ab18de43 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/common.am -DISTCLEANFILES += config.h libintl.h version.C stamp-version version.C-tmp +DISTCLEANFILES += config.h libintl.h version.cpp stamp-version version.cpp-tmp MAINTAINERCLEANFILES += $(srcdir)/config.h.in @@ -43,7 +43,7 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS) #lyx_LDFLAGS=-Wl,-O1 -BUILT_SOURCES = $(PCH_FILE) version.C +BUILT_SOURCES = $(PCH_FILE) version.cpp AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES) @@ -258,20 +258,20 @@ lyx_SOURCES = \ update_flags.h \ VCBackend.cpp \ VCBackend.h \ - version.C \ + version.cpp \ version.h \ WordLangTuple.h \ VSpace.cpp \ VSpace.h -version.C: stamp-version +version.cpp: stamp-version @: -stamp-version: version.C-tmp - if cmp -s $< version.C ; then \ +stamp-version: version.cpp-tmp + if cmp -s $< version.cpp ; then \ : ;\ else \ - rm -f version.C ;\ - cp $< version.C ;\ + rm -f version.cpp ;\ + cp $< version.cpp ;\ fi echo timestamp > $@ diff --git a/src/version.cpp.in b/src/version.cpp.in index e9100cb72c..c0777ffdd6 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,6 +1,6 @@ /* -*- C++ -*- */ /** - * \file version.C + * \file version.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. *