anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not put version information in config.h ; please test

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2802 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-09-26 09:57:01 +00:00
parent 55a2ce9c09
commit 3039a800bc
7 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2001-09-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* configure.in (VERSION_INFO): use AC_SUBST instead of AC_DEFINE
for VERSION_INFO
2001-09-12 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-09-12 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* configure.in: do not set FRONTENDS to "xforms" when frontend is * configure.in: do not set FRONTENDS to "xforms" when frontend is

3
configure.in
View File

@ -327,7 +327,7 @@ ${FRONTEND_INFO}\
LyX files dir: ${real_datadir}\n LyX files dir: ${real_datadir}\n
` `
AC_DEFINE_UNQUOTED(VERSION_INFO, "${VERSION_INFO}", Version information on the current build of LyX) AC_SUBST(VERSION_INFO)
### Finish the work. ### Finish the work.
AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX) AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
@ -339,6 +339,7 @@ AC_OUTPUT([Makefile \
po/Makefile.in \ po/Makefile.in \
sourcedoc/Doxyfile \ sourcedoc/Doxyfile \
src/Makefile \ src/Makefile \
src/version_info.h \
src/mathed/Makefile \ src/mathed/Makefile \
src/graphics/Makefile \ src/graphics/Makefile \
src/insets/Makefile \ src/insets/Makefile \

1
src/.cvsignore
View File

@ -1,5 +1,6 @@
ext_l10n.h ext_l10n.h
config.h config.h
version_info.h
lyx lyx
Makefile Makefile
Makefile.in Makefile.in

13
src/ChangeLog
View File

@ -1,3 +1,16 @@
2001-09-26 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* .cvsignore: add version_info.h
2001-09-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* version_info.h.in: new file
* Makefile.am: add version_info.h.in
* lyx_main.C (commandLineVersionInfo): use version_info defined in
version_info.h instead of VERSION_INFO
2001-09-24 Angus Leeming <a.leeming@ic.ac.uk> 2001-09-24 Angus Leeming <a.leeming@ic.ac.uk>
* text.C (selectNextWordToSpellcheck): reverted change to if-block. * text.C (selectNextWordToSpellcheck): reverted change to if-block.

6
src/Makefile.am
View File

@ -13,7 +13,7 @@ lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
$(PSPELL_LIBS) @AIKSAURUS_LIBS@ $(PSPELL_LIBS) @AIKSAURUS_LIBS@
#lyx_LDFLAGS=-Wl,-O1 #lyx_LDFLAGS=-Wl,-O1
EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version_info.h.in
ETAGS_ARGS = --lang=c++ ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@ INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
@ -213,6 +213,7 @@ lyx_SOURCES = \
vc-backend.C \ vc-backend.C \
vc-backend.h \ vc-backend.h \
version.h \ version.h \
version_info.h.in \
vms_defines.h \ vms_defines.h \
vspace.C \ vspace.C \
vspace.h vspace.h
@ -220,7 +221,8 @@ lyx_SOURCES = \
lyx_main.o: lyx_main.C lyx_main.h config.h version.h lyx_gui.h \ lyx_main.o: lyx_main.C lyx_main.h config.h version.h lyx_gui.h \
lyx_gui_misc.h lyxrc.h support/path.h support/filetools.h \ lyx_gui_misc.h lyxrc.h support/path.h support/filetools.h \
bufferlist.h debug.h support/FileInfo.h lastfiles.h intl.h \ bufferlist.h debug.h support/FileInfo.h lastfiles.h intl.h \
lyxserver.h layout.h gettext.h kbmap.h commandtags.h language.h lyxserver.h layout.h gettext.h kbmap.h commandtags.h language.h \
version_info.h.in
$(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \ $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \
-DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C

3
src/lyx_main.C
View File

@ -18,6 +18,7 @@
#endif #endif
#include "version.h" #include "version.h"
#include <version_info.h>
#include "lyx_main.h" #include "lyx_main.h"
#include "lyx_gui.h" #include "lyx_gui.h"
#include "LyXView.h" #include "LyXView.h"
@ -779,7 +780,7 @@ void commandLineVersionInfo()
lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl; lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl; lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
lyxerr << VERSION_INFO << endl; lyxerr << version_info << endl;
} }

20
src/version_info.h.in Normal file
View File

@ -0,0 +1,20 @@
/* -*- C++ -*- */
/* This file contains configuration information configuration file for
LyX. It was generated by autoconf's configure. Do not modify it.
* This file is part of
* ======================================================
*
* LyX, the High Level Word Processor
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995, 2001 The LyX Team.
*
*======================================================*/
#ifndef VERSION_INFO_H
#define VERSION_INFO_H
char const * version_info = "@VERSION_INFO@";
#endif