mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
get builddir!=srcdir compiling working; allow successful make even without noweb installed; fix picky compiler warnings in xforms/
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1078 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
1fefef3908
commit
ebfcf1c0e7
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2000-10-04 Allan Rae <rae@lyx.org>
|
||||
|
||||
* 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 <larsbj@lyx.org>
|
||||
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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_;
|
||||
|
@ -53,7 +53,7 @@ void FormError::clearStore()
|
||||
}
|
||||
|
||||
|
||||
void FormError::showInset( InsetError * const inset )
|
||||
void FormError::showInset( InsetError * inset )
|
||||
{
|
||||
if ( dialogIsOpen || inset == 0 ) return;
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user