Updated lyx to 1.2.0

Changes (see the NEWS file for a complete list):

- Floats, footnotes and margin notes are now real insets. The
  positional parameters of figure, table and algorithm floats can be set
  float-by-float

- Most problems with the new table inset of 1.1.6 have been addressed
  (memory consumption, file bloat, spell-checking, search and replace...).
  Better longtable header/footer support was implemented.

- Notes inset can now contain arbitrary LyX constructs; they will not
  appear in the output.

- New minipage inset

- New graphics inset with support for hassle-free inclusion of various
  image formats (GIF, JPEG, PNG and EPS by default) and a new
  rendering scheme that should fix the bugs we had with the older
  ghostscript method.

- Support for natbib for bibliography citations

- The math editor has been mostly rewritten

- New ligature break special character, useful for words like
  "shelfful", or many german words

- Support for parsing preamble when converting LaTeX files. Along
  with changes in the LaTeX production of alignment options, this
  improves round-trip work where you export a LyX document as
  LaTeX, and later reimport it from LaTeX.

- Support for setting bookmarks and jumping to them

- It is possible to cycle between a label and its references.

- Preliminary support for multiple bibliographies

- Babel can be disabled

- A thesaurus facility (English only)

5 files changed, 117 insertions, 59 deletions

diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 0a21fa45fba..08026de6240 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2002/04/19 16:53:41 fredb Exp $
+# $NetBSD: Makefile,v 1.45 2002/05/29 07:36:31 martti Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
 #
 
-DISTNAME=		lyx-1.1.6fix4
-PKGNAME=		lyx-1.1.6.4
-PKGREVISION=		2
+DISTNAME=		lyx-1.2.0
+PKGNAME=		lyx-1.2.0
 CATEGORIES=		print
 MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/ \
 			ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \
@@ -19,6 +18,12 @@ DEPENDS+=		teTeX>=1.0.6:../../print/teTeX
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		xforms>=0.9999:../../x11/xforms
 
+GCC_VERSION!=		gcc --version
+.if (${GCC_VERSION:C/-.*$$//} == egcs)
+# "egcs" cannot be used, as this package tickles c++ compiler bugs
+.include "../../lang/gcc/Makefile.gcc"
+.endif
+
 USE_PERL5=		YES
 USE_XPM=		YES
 GNU_CONFIGURE=		YES
diff --git a/print/lyx/PLIST b/print/lyx/PLIST
index abce7ee40f7..d8407c45528 100644
--- a/print/lyx/PLIST
+++ b/print/lyx/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/18 11:02:32 martti Exp $
-bin/listerrors
+@comment $NetBSD: PLIST,v 1.3 2002/05/29 07:36:31 martti Exp $
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
 man/man1/lyx.1
 man/man1/reLyX.1
+share/locale/bg/LC_MESSAGES/lyx.mo
 share/locale/ca/LC_MESSAGES/lyx.mo
 share/locale/cs/LC_MESSAGES/lyx.mo
 share/locale/da/LC_MESSAGES/lyx.mo
@@ -22,6 +22,7 @@ share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
 share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
@@ -32,9 +33,8 @@ share/lyx/bind/cua.bind
 share/lyx/bind/de_menus.bind
 share/lyx/bind/emacs.bind
 share/lyx/bind/fi_menus.bind
-share/lyx/bind/fr_menus.bind
 share/lyx/bind/hollywood.bind
-share/lyx/bind/hu_menus.bind
+share/lyx/bind/latinkeys.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
 share/lyx/bind/pt_menus.bind
@@ -45,11 +45,9 @@ share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
 share/lyx/configure
 share/lyx/configure.cmd
-share/lyx/doc/BUGS.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DocStyle.lyx
 share/lyx/doc/Extended.lyx
-share/lyx/doc/ExternalMaterial.lyx
 share/lyx/doc/FAQ.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LaTeXConfig.lyx
@@ -63,7 +61,6 @@ share/lyx/doc/cs_TOC.lyx
 share/lyx/doc/cs_Tutorial.lyx
 share/lyx/doc/da_Intro.lyx
 share/lyx/doc/da_TOC.lyx
-share/lyx/doc/de_BUGS.lyx
 share/lyx/doc/de_Customization.lyx
 share/lyx/doc/de_Extended.lyx
 share/lyx/doc/de_FAQ.lyx
@@ -78,10 +75,8 @@ share/lyx/doc/escher-lsd.eps
 share/lyx/doc/eu_Intro.lyx
 share/lyx/doc/eu_TOC.lyx
 share/lyx/doc/eu_Tutorial.lyx
-share/lyx/doc/fr_BUGS.lyx
 share/lyx/doc/fr_Customization.lyx
 share/lyx/doc/fr_Extended.lyx
-share/lyx/doc/fr_ExternalMaterial.lyx
 share/lyx/doc/fr_FAQ.lyx
 share/lyx/doc/fr_Intro.lyx
 share/lyx/doc/fr_TOC.lyx
@@ -107,6 +102,12 @@ share/lyx/doc/pt_TOC.lyx
 share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
+share/lyx/doc/ru_Intro.lyx
+share/lyx/doc/ru_TOC.lyx
+share/lyx/doc/ru_Tutorial.lyx
+share/lyx/doc/sk_TOC.lyx
+share/lyx/doc/sk_Tutorial.lyx
+share/lyx/doc/sk_UserGuide.lyx
 share/lyx/doc/sl_Intro.lyx
 share/lyx/doc/sl_TOC.lyx
 share/lyx/doc/sl_Tutorial.lyx
@@ -117,7 +118,6 @@ share/lyx/encodings
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
 share/lyx/examples/Literate.lyx
-share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Minipage.lyx
 share/lyx/examples/TableExamples.lyx
 share/lyx/examples/aa_sample.lyx
@@ -125,6 +125,9 @@ share/lyx/examples/aas_sample.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
 share/lyx/examples/ca_splash.lyx
+share/lyx/examples/chess-article.lyx
+share/lyx/examples/chessgame.lyx
+share/lyx/examples/currency.lyx
 share/lyx/examples/cv.lyx
 share/lyx/examples/da_splash.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
@@ -141,7 +144,6 @@ share/lyx/examples/eu_splash.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/fr_AlignementDecimal.lyx
-share/lyx/examples/fr_EtiquetteMath.lyx
 share/lyx/examples/fr_ExemplesTableaux.lyx
 share/lyx/examples/fr_ListesPuces.lyx
 share/lyx/examples/fr_Minipage.lyx
@@ -150,11 +152,16 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_splash.lyx
 share/lyx/examples/hu_splash.lyx
+share/lyx/examples/iecc05.fen
+share/lyx/examples/iecc07.fen
+share/lyx/examples/iecc12.fen
 share/lyx/examples/it_ItemizeBullets.lyx
 share/lyx/examples/it_splash.lyx
 share/lyx/examples/landslide.lyx
+share/lyx/examples/linuxdoc_manpage.lyx
+share/lyx/examples/listerrors.lyx
+share/lyx/examples/mathed.lyx
 share/lyx/examples/multicol.lyx
-share/lyx/examples/nl_MathLabeling.lyx
 share/lyx/examples/nl_multicol.lyx
 share/lyx/examples/nl_opsommingstekens.lyx
 share/lyx/examples/nl_splash.lyx
@@ -170,12 +177,13 @@ share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
 share/lyx/examples/splash.lyx
 share/lyx/external_templates
+share/lyx/help/Bibtex.hlp
+share/lyx/help/Texinfo.hlp
 share/lyx/images/amssymb.xpm
 share/lyx/images/banner.xpm
 share/lyx/images/buffer-close.xpm
 share/lyx/images/buffer-export_ascii.xpm
 share/lyx/images/buffer-export_latex.xpm
-share/lyx/images/buffer-open.xpm
 share/lyx/images/buffer-print.xpm
 share/lyx/images/buffer-update_dvi.xpm
 share/lyx/images/buffer-update_ps.xpm
@@ -183,17 +191,23 @@ share/lyx/images/buffer-view_dvi.xpm
 share/lyx/images/buffer-view_ps.xpm
 share/lyx/images/buffer-write.xpm
 share/lyx/images/build-program.xpm
+share/lyx/images/citation-insert.xpm
 share/lyx/images/copy.xpm
 share/lyx/images/cut.xpm
-share/lyx/images/depth-next.xpm
+share/lyx/images/depth-decrement.xpm
+share/lyx/images/depth-increment.xpm
 share/lyx/images/dialog-tabular-insert.xpm
-share/lyx/images/figure-insert.xpm
+share/lyx/images/ert-insert.xpm
+share/lyx/images/file-open.xpm
 share/lyx/images/font-bold.xpm
 share/lyx/images/font-emph.xpm
 share/lyx/images/font-free.xpm
 share/lyx/images/font-noun.xpm
 share/lyx/images/font-sans.xpm
 share/lyx/images/footnote-insert.xpm
+share/lyx/images/graphics-insert.xpm
+share/lyx/images/index-insert.xpm
+share/lyx/images/label-insert.xpm
 share/lyx/images/layout.xpm
 share/lyx/images/layout_LaTeX.xpm
 share/lyx/images/layout_LyX-Code.xpm
@@ -202,8 +216,8 @@ share/lyx/images/layout_Section.xpm
 share/lyx/images/lyx-quit.xpm
 share/lyx/images/lyx.xpm
 share/lyx/images/marginalnote-insert.xpm
-share/lyx/images/marginpar-insert.xpm
 share/lyx/images/math-mode.xpm
+share/lyx/images/math-panel.xpm
 share/lyx/images/melt.xpm
 share/lyx/images/paste.xpm
 share/lyx/images/psnfss1.xpm
@@ -213,12 +227,12 @@ share/lyx/images/psnfss4.xpm
 share/lyx/images/redo.xpm
 share/lyx/images/standard.xpm
 share/lyx/images/tabular-insert.xpm
-share/lyx/images/tex-mode.xpm
 share/lyx/images/undo.xpm
 share/lyx/images/unknown.xpm
 share/lyx/kbd/american-2.kmap
 share/lyx/kbd/american.kmap
 share/lyx/kbd/arabic.kmap
+share/lyx/kbd/bg-bds-1251.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech-prg.kmap
@@ -238,6 +252,7 @@ share/lyx/kbd/iso8859-3.cdef
 share/lyx/kbd/iso8859-4.cdef
 share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/iso8859-8.cdef
+share/lyx/kbd/iso8859-9.cdef
 share/lyx/kbd/koi8-r.kmap
 share/lyx/kbd/koi8-u.kmap
 share/lyx/kbd/latvian.kmap
@@ -277,6 +292,7 @@ share/lyx/layouts/apa.layout
 share/lyx/layouts/article.layout
 share/lyx/layouts/book.layout
 share/lyx/layouts/broadway.layout
+share/lyx/layouts/chess.layout
 share/lyx/layouts/cv.layout
 share/lyx/layouts/db_lyxmacros.inc
 share/lyx/layouts/db_stdclass.inc
@@ -291,8 +307,8 @@ share/lyx/layouts/docbook-book.layout
 share/lyx/layouts/docbook-chapter.layout
 share/lyx/layouts/docbook-section.layout
 share/lyx/layouts/docbook.layout
+share/lyx/layouts/dtk.layout
 share/lyx/layouts/egs.layout
-share/lyx/layouts/ejour2.layout
 share/lyx/layouts/entcs.layout
 share/lyx/layouts/extarticle.layout
 share/lyx/layouts/extbook.layout
@@ -314,6 +330,7 @@ share/lyx/layouts/literate-book.layout
 share/lyx/layouts/literate-report.layout
 share/lyx/layouts/literate-scrap.inc
 share/lyx/layouts/llncs.layout
+share/lyx/layouts/ltugboat.layout
 share/lyx/layouts/lyxmacros.inc
 share/lyx/layouts/manpage.layout
 share/lyx/layouts/obsolete.inc
@@ -330,6 +347,7 @@ share/lyx/layouts/scrreprt.layout
 share/lyx/layouts/seminar.layout
 share/lyx/layouts/siamltex.layout
 share/lyx/layouts/slides.layout
+share/lyx/layouts/spie.layout
 share/lyx/layouts/stdclass.inc
 share/lyx/layouts/stdlayouts.inc
 share/lyx/layouts/stdletter.inc
@@ -340,6 +358,7 @@ share/lyx/layouts/stdstruct.inc
 share/lyx/layouts/stdtitle.inc
 share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
+share/lyx/layouts/svprobth.layout
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst
@@ -358,17 +377,20 @@ share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
-share/lyx/scripts/fen2latex.py
+share/lyx/scripts/TeXFiles.sh
+share/lyx/scripts/fen2ascii.py
 share/lyx/scripts/fig2pstex.py
 share/lyx/scripts/general_command_wrapper.py
+share/lyx/scripts/listerrors
 share/lyx/scripts/pic2ascii.py
 share/lyx/scripts/pic2png_eps.py
 share/lyx/scripts/pic2png_eps.sh
+share/lyx/symbols
 share/lyx/templates/IEEEtran.lyx
 share/lyx/templates/aa.lyx
 share/lyx/templates/aastex.lyx
 share/lyx/templates/dinbrief.lyx
-share/lyx/templates/docbook_template.lyx
+share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
@@ -376,23 +398,34 @@ share/lyx/templates/iletter.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
-share/lyx/templates/linuxdoctemplate.lyx
+share/lyx/templates/linuxdoc_article.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/revtex4.lyx
 share/lyx/templates/slides.lyx
 share/lyx/tex/broadway.cls
 share/lyx/tex/cv.cls
-share/lyx/tex/ejour2.cls
 share/lyx/tex/hollywood.cls
 share/lyx/tex/iletter.cls
+share/lyx/tex/lyxchess.sty
+share/lyx/tex/lyxskak.sty
 share/lyx/tex/revtex.cls
 share/lyx/textclass.lst
 share/lyx/ui/default.ui
 share/lyx/ui/old-default.ui
+share/lyx/xfonts/cmex10.pfb
+share/lyx/xfonts/cmmi10.pfb
+share/lyx/xfonts/cmr10.pfb
+share/lyx/xfonts/cmsy10.pfb
+share/lyx/xfonts/eufm10.pfb
+share/lyx/xfonts/fonts.dir
+share/lyx/xfonts/fonts.scale
+share/lyx/xfonts/msam10.pfb
+share/lyx/xfonts/msbm10.pfb
 @dirrm share/lyx/bind
 @dirrm share/lyx/clipart
 @dirrm share/lyx/doc
 @dirrm share/lyx/examples
+@dirrm share/lyx/help
 @dirrm share/lyx/images
 @dirrm share/lyx/kbd
 @dirrm share/lyx/layouts
@@ -402,4 +435,5 @@ share/lyx/ui/old-default.ui
 @dirrm share/lyx/templates
 @dirrm share/lyx/tex
 @dirrm share/lyx/ui
+@dirrm share/lyx/xfonts
 @dirrm share/lyx
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index d15e9cb0083..9f783f5473c 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2002/04/18 23:55:27 fredb Exp $
+$NetBSD: distinfo,v 1.10 2002/05/29 07:36:31 martti Exp $
 
-SHA1 (lyx-1.1.6fix4.tar.gz) = 0256ba5955bf98068f8dc0768224d70840858418
-Size (lyx-1.1.6fix4.tar.gz) = 5564584 bytes
-SHA1 (patch-aa) = 91117be8d09ccc7c85fd6c5e38e26f44ea063f78
-SHA1 (patch-ab) = d56a17928e8ddc6dc0b76140f8ecf9d592049794
+SHA1 (lyx-1.2.0.tar.gz) = 56db850f316c18e00c4b10946216b6eb25107dab
+Size (lyx-1.2.0.tar.gz) = 6418424 bytes
+SHA1 (patch-aa) = c7837f717a9cddd0f2577dd5f942641f75220044
+SHA1 (patch-ab) = 02d7b4247aaffefb1fb6862d2b0877e4bfe4755a
diff --git a/print/lyx/patches/patch-aa b/print/lyx/patches/patch-aa
index fad0002e169..e5545847206 100644
--- a/print/lyx/patches/patch-aa
+++ b/print/lyx/patches/patch-aa
@@ -1,31 +1,48 @@
-$NetBSD: patch-aa,v 1.8 2002/04/18 23:55:27 fredb Exp $
+$NetBSD: patch-aa,v 1.9 2002/05/29 07:36:31 martti Exp $
 
---- configure.orig	Fri Aug  3 07:21:35 2001
-+++ configure
-@@ -8175,7 +8175,7 @@
+--- configure.orig	Fri May  3 22:53:34 2002
++++ configure	Tue May 21 12:15:00 2002
+@@ -9743,7 +9743,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
--LIBS="-lforms $LYX_LIBS $LIBS"
-+LIBS="-lforms -ljpeg -lXpm $LYX_LIBS $LIBS"
+-LIBS="-lforms  $LIBS"
++LIBS="-lforms -ljpeg -lXpm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 8181 "configure"
+ #line 9749 "configure"
  #include "confdefs.h"
-@@ -8206,7 +8206,7 @@
+@@ -9774,7 +9774,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
--  LYX_LIBS="-lforms $LYX_LIBS"
-+  LYX_LIBS="-lforms -ljpeg -lXpm $LYX_LIBS"
+-  XFORMS_LIB="-lforms"
++  XFORMS_LIB="-lforms -ljpeg -lXpm"
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6
-@@ -9764,7 +9764,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
+@@ -9954,6 +9954,7 @@
+ "
+ lyx_warning=yes ;;
+     0.89*) ;;
++    0.9*) ;;
+        *) 
+ lyx_warning_txt="$lyx_warning_txt
+ == Version $lyx_cv_xfversion of xforms might not be compatible with LyX,
+@@ -10159,7 +10160,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lforms  $LIBS"
++LIBS="-lforms -ljpeg -lXpm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 10165 "configure"
+ #include "confdefs.h"
+@@ -10190,7 +10191,7 @@
  fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  XFORMS_LIB="-lforms"
++  XFORMS_LIB="-lforms -ljpeg -lXpm"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6
diff --git a/print/lyx/patches/patch-ab b/print/lyx/patches/patch-ab
index 9122a94a461..c8ad7e439d0 100644
--- a/print/lyx/patches/patch-ab
+++ b/print/lyx/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/04/18 15:59:56 fredb Exp $
+$NetBSD: patch-ab,v 1.2 2002/05/29 07:36:31 martti Exp $
 
 Avoid the following error with gcc-2.95.3 (NetBSD-1.5ZC-m68k):
 
@@ -17,16 +17,18 @@ Avoid the following error with gcc-2.95.3 (NetBSD-1.5ZC-m68k):
 Line 3027 is a single close bracket, the end of a switch statement that starts
 on line 675. Increasing the process stack size to 32768 didn't help.
 
---- src/Makefile.in.orig	Wed Apr 17 10:36:29 2002
-+++ src/Makefile.in
-@@ -414,6 +414,10 @@
- lyx$(EXEEXT): $(lyx_OBJECTS) $(lyx_DEPENDENCIES)
+--- src/Makefile.in.orig	Fri May  3 22:53:28 2002
++++ src/Makefile.in	Mon May  6 08:30:00 2002
+@@ -652,6 +652,12 @@
  	@rm -f lyx$(EXEEXT)
  	$(CXXLINK) $(lyx_LDFLAGS) $(lyx_OBJECTS) $(lyx_LDADD) $(LIBS)
+ 
 +lyxfunc.o: lyxfunc.C
-+	$(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $<
++	$(CXX) $(DEFS) -I. $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $<
++
 +lyxfunc.lo: lyxfunc.C
-+	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $<
- .C.o:
- 	$(CXXCOMPILE) -c $<
- .C.lo:
++	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) -I. $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) -O -c $<
++
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
+