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

get builddir!=srcdir compiling working; allow successful make even without noweb installed; fix picky compiler warnings in xforms/

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1078 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Allan Rae 2000-10-04 03:17:36 +00:00
parent 1fefef3908
commit ebfcf1c0e7
7 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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> 2000-10-03 Lars Gullik Bjønnes <larsbj@lyx.org>

2
lib/Makefile.am
View File

@ -59,4 +59,4 @@ dist-hook:
echo "WARNING: Unable to get LyX Documentation from CVS!" ; true ; } echo "WARNING: Unable to get LyX Documentation from CVS!" ; true ; }
listerrors: examples/Literate.lyx listerrors: examples/Literate.lyx
${srcdir}/build-listerrors ${srcdir}/build-listerrors ${srcdir}

17
lib/build-listerrors
View File

@ -6,6 +6,13 @@
# #
# Assume notangle is on the path # Assume notangle is on the path
if [ $# -eq 1 ]
then
dir=$1
else
dir=.
fi
if [ -r ../src/lyx ] if [ -r ../src/lyx ]
then then
lyx=../src/lyx lyx=../src/lyx
@ -14,6 +21,10 @@ else
lyx=lyx lyx=lyx
fi fi
$lyx --export nw examples/Literate.lyx $lyx --export nw $dir/examples/Literate.lyx
mv examples/Literate.nw Literate.nw # if no literate support stuff is installed nothing will be output
notangle -Rbuild-script Literate.nw | sh 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

2
src/frontends/xforms/FormCommand.C
View File

@ -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; if ( dialogIsOpen || inset == 0 ) return;

2
src/frontends/xforms/FormCommand.h
View File

@ -32,7 +32,7 @@ protected:
/// Slot launching dialog to (possibly) create a new inset /// Slot launching dialog to (possibly) create a new inset
void createInset( string const & ); void createInset( string const & );
/// Slot launching dialog to an existing inset /// Slot launching dialog to an existing inset
void showInset( InsetCommand * const ); void showInset( InsetCommand * );
/// pointer to the inset passed through showInset (if any) /// pointer to the inset passed through showInset (if any)
InsetCommand * inset_; InsetCommand * inset_;

2
src/frontends/xforms/FormError.C
View File

@ -53,7 +53,7 @@ void FormError::clearStore()
} }
void FormError::showInset( InsetError * const inset ) void FormError::showInset( InsetError * inset )
{ {
if ( dialogIsOpen || inset == 0 ) return; if ( dialogIsOpen || inset == 0 ) return;

2
src/frontends/xforms/FormError.h
View File

@ -31,7 +31,7 @@ public:
~FormError(); ~FormError();
private: private:
/// Slot launching dialog to an existing inset /// Slot launching dialog to an existing inset
void showInset( InsetError * const ); void showInset( InsetError * );
/// Update dialog before showing it /// Update dialog before showing it
virtual void update(); virtual void update();
/// Build the dialog /// Build the dialog