diff --git a/ChangeLog b/ChangeLog index 62460717ec..6c2f10ecce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-10-04 Allan Rae + + * lib/Makefile.am (listerrors): + * lib/build-listerrors: make $builddir != $srcdir compiles work again. + I haven't got notangle installed so Kayvan please test. The output + should end up in $builddir. This also allows people who don't have + noweb installed to complete the make process without error. + + * src/frontends/xforms/FormCommand.[Ch] (showInset): + * src/frontends/xforms/FormError.[Ch] (showInset): fix warnings found + by JMarc's picky compiler. + 2000-10-03 Lars Gullik Bjønnes diff --git a/lib/Makefile.am b/lib/Makefile.am index ea27b22fac..3e28539aa7 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -59,4 +59,4 @@ dist-hook: echo "WARNING: Unable to get LyX Documentation from CVS!" ; true ; } listerrors: examples/Literate.lyx - ${srcdir}/build-listerrors + ${srcdir}/build-listerrors ${srcdir} diff --git a/lib/build-listerrors b/lib/build-listerrors index bb5cec083e..c8f371ef54 100755 --- a/lib/build-listerrors +++ b/lib/build-listerrors @@ -6,6 +6,13 @@ # # Assume notangle is on the path +if [ $# -eq 1 ] +then + dir=$1 +else + dir=. +fi + if [ -r ../src/lyx ] then lyx=../src/lyx @@ -14,6 +21,10 @@ else lyx=lyx fi -$lyx --export nw examples/Literate.lyx -mv examples/Literate.nw Literate.nw -notangle -Rbuild-script Literate.nw | sh +$lyx --export nw $dir/examples/Literate.lyx +# if no literate support stuff is installed nothing will be output +if [ -f $dir/examples/Literate.nw ] +then + mv $dir/examples/Literate.nw Literate.nw + which notangle 2>/dev/null && notangle -Rbuild-script Literate.nw | sh +fi diff --git a/src/frontends/xforms/FormCommand.C b/src/frontends/xforms/FormCommand.C index 2e721033d9..81296f39c8 100644 --- a/src/frontends/xforms/FormCommand.C +++ b/src/frontends/xforms/FormCommand.C @@ -28,7 +28,7 @@ FormCommand::FormCommand( LyXView * lv, Dialogs * d, string const & t, {} -void FormCommand::showInset( InsetCommand * const inset ) +void FormCommand::showInset( InsetCommand * inset ) { if ( dialogIsOpen || inset == 0 ) return; diff --git a/src/frontends/xforms/FormCommand.h b/src/frontends/xforms/FormCommand.h index 7f5fd0bada..ac365ffbc9 100644 --- a/src/frontends/xforms/FormCommand.h +++ b/src/frontends/xforms/FormCommand.h @@ -32,7 +32,7 @@ protected: /// Slot launching dialog to (possibly) create a new inset void createInset( string const & ); /// Slot launching dialog to an existing inset - void showInset( InsetCommand * const ); + void showInset( InsetCommand * ); /// pointer to the inset passed through showInset (if any) InsetCommand * inset_; diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C index a861ef54db..9a88be148d 100644 --- a/src/frontends/xforms/FormError.C +++ b/src/frontends/xforms/FormError.C @@ -53,7 +53,7 @@ void FormError::clearStore() } -void FormError::showInset( InsetError * const inset ) +void FormError::showInset( InsetError * inset ) { if ( dialogIsOpen || inset == 0 ) return; diff --git a/src/frontends/xforms/FormError.h b/src/frontends/xforms/FormError.h index fb7003a0ad..cfb3005967 100644 --- a/src/frontends/xforms/FormError.h +++ b/src/frontends/xforms/FormError.h @@ -31,7 +31,7 @@ public: ~FormError(); private: /// Slot launching dialog to an existing inset - void showInset( InsetError * const ); + void showInset( InsetError * ); /// Update dialog before showing it virtual void update(); /// Build the dialog