make to compilation with gcc 2.96 better handle (/.../.../xxx.sty) in dependency...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1201 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index ba2bae0ad64bc0cd2297b8976ec03dbfed93a183..dff67d472d2737db16ef6abac4e26fd6489a21d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-07  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * src/LaTeX.C (deplog): change reg1 to handle (/.../.../fil.sty)
+
+       * config/lyxinclude.m4 (LYX_PROG_CXX): remove -fno-rtti when
+       compiling with gcc-2.96
+
 2000-11-06  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * src/support/lyxstring.C: add a couple "using" directives.

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index b6114f13d2ea67b20614a80244dbf481efd48517..e5522afec824651a24ec991ad8a4eef7e717e393 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -186,7 +186,7 @@ dnl Check the version of g++
     case $gxx_version in
       2.95.1)  CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
       2.95.*)  CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
-      2.96*)  CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+      2.96*)  CXXFLAGS="-g $lyx_opt -fno-exceptions";;
       2.97*)   CXXFLAGS="-g $lyx_opt -fhonor-std -fno-builtin -ffunction-sectons -fdata-sections";;
       *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
       *)       CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;

diff --git a/po/POTFILES.in b/po/POTFILES.in
index cfcf30161702ce831e6a246162c5ebeb468f4f14..d18943019e80b3f29bea47097260ae46c3037269 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -47,35 +47,35 @@ src/frontends/kde/refdlg.C
 src/frontends/kde/tocdlg.C
 src/frontends/kde/urldlg.C
 src/frontends/xforms/FormBase.h
-src/frontends/xforms/FormCitation.C
 src/frontends/xforms/form_citation.C
-src/frontends/xforms/FormCopyright.C
+src/frontends/xforms/FormCitation.C
 src/frontends/xforms/form_copyright.C
-src/frontends/xforms/FormDocument.C
+src/frontends/xforms/FormCopyright.C
 src/frontends/xforms/form_document.C
-src/frontends/xforms/FormError.C
+src/frontends/xforms/FormDocument.C
 src/frontends/xforms/form_error.C
-src/frontends/xforms/FormGraphics.C
+src/frontends/xforms/FormError.C
 src/frontends/xforms/form_graphics.C
-src/frontends/xforms/FormIndex.C
+src/frontends/xforms/FormGraphics.C
 src/frontends/xforms/form_index.C
+src/frontends/xforms/FormIndex.C
 src/frontends/xforms/FormInset.h
-src/frontends/xforms/FormParagraph.C
 src/frontends/xforms/form_paragraph.C
-src/frontends/xforms/FormPreferences.C
+src/frontends/xforms/FormParagraph.C
 src/frontends/xforms/form_preferences.C
-src/frontends/xforms/FormPrint.C
+src/frontends/xforms/FormPreferences.C
 src/frontends/xforms/form_print.C
-src/frontends/xforms/FormRef.C
+src/frontends/xforms/FormPrint.C
 src/frontends/xforms/form_ref.C
-src/frontends/xforms/FormTabular.C
+src/frontends/xforms/FormRef.C
 src/frontends/xforms/form_tabular.C
-src/frontends/xforms/FormTabularCreate.C
+src/frontends/xforms/FormTabular.C
 src/frontends/xforms/form_tabular_create.C
-src/frontends/xforms/FormToc.C
+src/frontends/xforms/FormTabularCreate.C
 src/frontends/xforms/form_toc.C
-src/frontends/xforms/FormUrl.C
+src/frontends/xforms/FormToc.C
 src/frontends/xforms/form_url.C
+src/frontends/xforms/FormUrl.C
 src/frontends/xforms/Menubar_pimpl.C
 src/gettext.h
 src/importer.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index fc3b40343ff66808f6fd2c2b51b2fbd0cd46c773..0db816277c23a06a85ef02e66c76abf9da97c6f0 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -593,7 +593,7 @@ void LaTeX::deplog(DepTable & head)
 
        string logfile = OnlyFilename(ChangeExtension(file, ".log"));
 
-       LRegex reg1(")* *\\(([^ ]+).*");
+       LRegex reg1(")* *\\(([^ \\)]+).*");
        LRegex reg2("File: ([^ ]+).*");
        LRegex reg3("No file ([^ ]+)\\..*");
        LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*");