Lars, please look - I don't know why src/Makefile.am needed changing
suddenly.
Are the symlinks OK with you ? They certainly cut down on compile time
...
regards
john
--
I am a complete moron for forgetting about endianness. May I be
forever marked as such.
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.816
diff -u -r1.816 ChangeLog
--- ChangeLog 2002/02/27 12:17:58 1.816
+++ ChangeLog 2002/03/01 17:01:20
@@ -1,3 +1,7 @@
+2002-03-01 John Levon <[EMAIL PROTECTED]>
+
+ * configure.in: fixup qt2
+
2002-02-27 Angus Leeming <[EMAIL PROTECTED]>
* configure.in: don't compile src/frontends/support as LyXImage is
Index: configure.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.in,v
retrieving revision 1.91
diff -u -r1.91 configure.in
--- configure.in 2002/03/01 15:08:12 1.91
+++ configure.in 2002/03/01 17:01:22
@@ -189,7 +189,7 @@
FRONTEND="xforms"
FRONTEND_GUILIB="xforms/*.lo"
FRONTEND_INCLUDES="-I\$(srcdir)/xforms";;
- gnome)
+ gnome)
AM_PATH_GTKMM(1.2.1,,
AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
AM_PATH_GNOMEMM
@@ -213,8 +213,8 @@
FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade
gnomeui`";;
qt2)
QT2_DO_IT_ALL
- FRONTEND="xforms qt2"
- FRONTEND_GUILIB="qt2/*.lo"
+ FRONTEND="qt2"
+ FRONTEND_GUILIB="qt2/*.lo qt2/moc/*.lo qt2/ui/*.lo qt2/ui/moc/*.lo"
FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
FRONTEND_LIBS="\$(QT2_LIBS)";;
diff -u -r1.580 ChangeLog
--- src/ChangeLog 2002/03/01 14:13:01 1.580
+++ src/ChangeLog 2002/03/01 17:01:43
@@ -1,3 +1,7 @@
+2002-03-01 John Levon <[EMAIL PROTECTED]>
+
+ * Makefile.am: use FRONTEND_*
+
2002-03-01 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* minibuffer.C (MiniBuffer): reset timout to 6000, as it was before.
Index: src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.109
diff -u -r1.109 Makefile.am
--- src/Makefile.am 2002/03/01 09:25:42 1.109
+++ src/Makefile.am 2002/03/01 17:01:44
@@ -10,7 +10,7 @@
support/libsupport.o \
@INCLUDED_SIGC@
lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
- $(PSPELL_LIBS) @AIKSAURUS_LIBS@ @LYX_LIBS@
+ $(PSPELL_LIBS) @AIKSAURUS_LIBS@ @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
#lyx_LDFLAGS=-Wl,-O1
EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.87
diff -u -r1.87 ChangeLog
--- src/frontends/qt2/ChangeLog 2002/02/18 01:44:55 1.87
+++ src/frontends/qt2/ChangeLog 2002/03/01 17:01:46
@@ -1,12 +1,15 @@
-2002-02-18 John Levon <[EMAIL PROTECTED]>
+2002-03-01 John Levon <[EMAIL PROTECTED]>
* Makefile.am:
* moc/Makefile.am:
* ui/Makefile.am:
- * ui/moc/Makefile.am: use .o for libs
+ * ui/moc/Makefile.am: fix compile
* QPreambleDialog.C: new systemcall interface
+ * Timeout_pimpl.h:
+ * Timeout_pimpl.C: add running()
+
2002-02-06 John Levon <[EMAIL PROTECTED]>
* QToc.C: fix crash
Index: src/frontends/qt2/Dialogs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Dialogs.C,v
retrieving revision 1.45
diff -u -r1.45 Dialogs.C
--- src/frontends/qt2/Dialogs.C 2002/01/29 10:05:09 1.45
+++ src/frontends/qt2/Dialogs.C 2002/03/01 17:01:46
@@ -73,13 +73,15 @@
#include "Qt2BC.h"
// xforms stuff
-//#include "xforms/FormDocument.h"
+#include "xforms/FormDocument.h"
#include "xforms/FormMathsPanel.h"
-//#include "xforms/FormParagraph.h"
+#include "xforms/FormParagraph.h"
#include "xforms/FormPreferences.h"
#include "xforms/FormShowFile.h"
#include "xforms/FormTabular.h"
+#include "graphics/GraphicsImageXPM.h"
+
#include "GUI.h"
// this makes no real sense for Qt2
@@ -117,13 +119,26 @@
add(new GUIVCLog<QVCLog, Qt2BC>(*lv, *this));
// dialogs not yet MVCd
-// add(new FormDocument(lv, this));
+ add(new FormDocument(lv, this));
add(new FormMathsPanel(lv, this));
-// add(new FormParagraph(lv, this));
+ add(new FormParagraph(lv, this));
add(new FormPreferences(lv, this));
add(new FormTabular(lv, this));
// reduce the number of connections needed in
// dialogs by a simple connection here.
hideAll.connect(hideBufferDependent.slot());
+}
+
+
+// Called bu the graphics cache to connect the approriate frontend
+// image loading routines to the LyX kernel.
+void Dialogs::initialiseGraphics()
+{
+ using namespace grfx;
+ using SigC::slot;
+
+ // connect the image loader based on the XPM library
+ GImage::newImage.connect(slot(&GImageXPM::newImage));
+ GImage::loadableFormats.connect(slot(&GImageXPM::loadableFormats));
}
Index: src/frontends/qt2/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Makefile.am,v
retrieving revision 1.41
diff -u -r1.41 Makefile.am
--- src/frontends/qt2/Makefile.am 2002/02/18 01:44:55 1.41
+++ src/frontends/qt2/Makefile.am 2002/03/01 17:01:46
@@ -1,60 +1,106 @@
AUTOMAKE_OPTIONS = foreign 1.4
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2.o
+noinst_LTLIBRARIES = libqt2.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
SUBDIRS=ui moc
INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
- ${SIGC_CFLAGS} ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
+ ${SIGC_CFLAGS} -I$(top_srcdir)/images ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
-DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
+DISTCLEANFILES = $(XFORMS_SOURCES) $(BUILTSOURCES) *.orig *.rej *~ *.bak core
include Makefile.dialogs
-libqt2_o_LIBADD = \
- ui/libqt2ui.o \
- moc/libqt2moc.o \
- ui/moc/libqt2uimoc.o \
- ../xforms/combox.o \
- ../xforms/Alert_pimpl.o \
- ../xforms/Color.o \
- ../xforms/DropDown.o \
- ../xforms/FormBase.o \
- ../xforms/FormBaseDeprecated.o \
- ../xforms/FormMathsBitmap.o \
- ../xforms/FormMathsDeco.o \
- ../xforms/FormMathsDelim.o \
- ../xforms/FormMathsMatrix.o \
- ../xforms/FormMathsPanel.o \
- ../xforms/FormMathsStyle.o \
- ../xforms/FormMathsSpace.o \
- ../xforms/FormPreferences.o \
- ../xforms/FormTabular.o \
- ../xforms/FormInset.o \
- ../xforms/MathsSymbols.o \
- ../xforms/Menubar_pimpl.o \
- ../xforms/RadioButtonGroup.o \
- ../xforms/Toolbar_pimpl.o \
- ../xforms/bmtable.o \
- ../xforms/form_preferences.o \
- ../xforms/form_tabular.o \
- ../xforms/form_maths_deco.o \
- ../xforms/form_maths_delim.o \
- ../xforms/form_maths_matrix.o \
- ../xforms/form_maths_panel.o \
- ../xforms/form_maths_space.o \
- ../xforms/form_maths_style.o \
- ../xforms/input_validators.o \
- ../xforms/xformsBC.o \
- ../xforms/xforms_helpers.o \
+XFORMS_SOURCES = \
+ Alert_pimpl.C \
+ bmtable.h \
+ bmtable.c \
+ combox.h \
+ combox.C \
+ Color.h \
+ Color.C \
+ DropDown.h \
+ DropDown.C \
+ FormBase.h \
+ FormBase.C \
+ FormBaseDeprecated.h \
+ FormBaseDeprecated.C \
+ FormDocument.h \
+ FormDocument.C \
+ FormParagraph.h \
+ FormParagraph.C \
+ FormMathsBitmap.h \
+ FormMathsBitmap.C \
+ FormMathsDeco.h \
+ FormMathsDeco.C \
+ FormMathsDelim.h \
+ FormMathsDelim.C \
+ FormMathsMatrix.h \
+ FormMathsMatrix.C \
+ FormMathsPanel.h \
+ FormMathsPanel.C \
+ FormMathsStyle.h \
+ FormMathsStyle.C \
+ FormMathsSpace.h \
+ FormMathsSpace.C \
+ FormPreferences.h \
+ FormPreferences.C \
+ FormTabular.h \
+ FormTabular.C \
+ FormInset.h \
+ FormInset.C \
+ MathsSymbols.h \
+ MathsSymbols.C \
+ Menubar_pimpl.h \
+ Menubar_pimpl.C \
+ RadioButtonGroup.h \
+ RadioButtonGroup.C \
+ Toolbar_pimpl.h \
+ Toolbar_pimpl.C \
+ Tooltips.h \
+ Tooltips.C \
+ form_document.h \
+ form_document.C \
+ form_paragraph.h \
+ form_paragraph.C \
+ form_preferences.h \
+ form_preferences.C \
+ form_tabular.h \
+ form_tabular.C \
+ form_maths_deco.h \
+ form_maths_deco.C \
+ form_maths_delim.h \
+ form_maths_delim.C \
+ form_maths_matrix.h \
+ form_maths_matrix.C \
+ form_maths_panel.h \
+ form_maths_panel.C \
+ form_maths_space.h \
+ form_maths_space.C \
+ form_maths_style.h \
+ form_maths_style.C \
+ input_validators.h \
+ input_validators.C \
+ xformsBC.h \
+ xformsBC.C \
+ xforms_helpers.h \
+ xforms_helpers.C
+
+libqt2_la_LIBADD = \
@LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+clean-xforms:
+ rm -rf $(XFORMS_SOURCES)
+
+$(XFORMS_SOURCES):
+ for i in $(XFORMS_SOURCES); do ln -sf "../xforms/$$i" . ; done
+
LIBS=
-#LDFLAGS= $(libqt2_la_OBJADD)
ETAGS_ARGS = --lang=c++
-libqt2_o_SOURCES = \
+libqt2_la_SOURCES = \
+ $(XFORMS_SOURCES) \
$(DIALOGSOURCES) \
Dialogs.C \
GUIRunTime.C \
Index: src/frontends/qt2/QPreambleDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPreambleDialog.C,v
retrieving revision 1.4
diff -u -r1.4 QPreambleDialog.C
--- src/frontends/qt2/QPreambleDialog.C 2002/02/18 01:44:55 1.4
+++ src/frontends/qt2/QPreambleDialog.C 2002/03/01 17:01:48
@@ -18,7 +18,7 @@
#include "QPreamble.h"
#include "support/lyxlib.h"
-#include "support/syscall.h"
+#include "support/forkedcall.h"
#include "support/filetools.h"
#include "gettext.h"
@@ -81,10 +81,10 @@
editor += " " + filename;
- Systemcalls sys;
+ Forkedcall call;
- // FIXME: synchronous, ugh. Make async when moved to controllers ?
- if (sys.startscript(Systemcalls::Wait, editor)) {
+ // FIXME: make async
+ if (call.startscript(Forkedcall::Wait, editor)) {
lyx::unlink(filename);
return;
}
Index: src/frontends/qt2/Timeout_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Timeout_pimpl.C,v
retrieving revision 1.1
diff -u -r1.1 Timeout_pimpl.C
--- src/frontends/qt2/Timeout_pimpl.C 2001/08/25 03:00:19 1.1
+++ src/frontends/qt2/Timeout_pimpl.C 2002/03/01 17:01:48
@@ -36,9 +36,15 @@
}
+bool Timeout::Pimpl::running() const
+{
+ return timeout_id != -1;
+}
+
+
void Timeout::Pimpl::start()
{
- if (timeout_id != -1)
+ if (running())
lyxerr << "Timeout::start: already running!" << endl;
timeout_id = startTimer(owner_->timeout_ms);
}
@@ -46,6 +52,6 @@
void Timeout::Pimpl::stop()
{
- if (timeout_id != -1)
+ if (running())
reset();
}
Index: src/frontends/qt2/Timeout_pimpl.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Timeout_pimpl.h,v
retrieving revision 1.1
diff -u -r1.1 Timeout_pimpl.h
--- src/frontends/qt2/Timeout_pimpl.h 2001/08/25 03:00:19 1.1
+++ src/frontends/qt2/Timeout_pimpl.h 2002/03/01 17:01:48
@@ -36,6 +36,8 @@
void stop();
/// reset
void reset();
+ /// is the timer running ?
+ bool running() const;
protected:
/// slot
Index: src/frontends/qt2/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/moc/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- src/frontends/qt2/moc/Makefile.am 2002/02/18 01:44:56 1.7
+++ src/frontends/qt2/moc/Makefile.am 2002/03/01 17:01:48
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign 1.4
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2moc.o
+noinst_LTLIBRARIES = libqt2moc.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \
@@ -13,7 +13,7 @@
include ../Makefile.dialogs
-libqt2moc_o_SOURCES := FileDialog_private_moc.C \
+libqt2moc_la_SOURCES := FileDialog_private_moc.C \
emptytable_moc.C \
lengthcombo_moc.C \
qttableview_moc.C \
Index: src/frontends/qt2/ui/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- src/frontends/qt2/ui/Makefile.am 2002/02/18 01:44:56 1.7
+++ src/frontends/qt2/ui/Makefile.am 2002/03/01 17:01:48
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign 1.4
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2ui.o
+noinst_LTLIBRARIES = libqt2ui.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/
-I$(top_srcdir)/src/frontends/qt2/ \
${SIGC_CFLAGS} ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
@@ -13,7 +13,7 @@
DISTCLEANFILES = $(UIDIALOGS) *.orig *.rej *~ *.bak core
-libqt2ui_o_SOURCES = $(UIDIALOGS)
+libqt2ui_la_SOURCES = $(UIDIALOGS)
# a pattern to change tr() to _()
Index: src/frontends/qt2/ui/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/moc/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- src/frontends/qt2/ui/moc/Makefile.am 2002/02/18 01:44:56 1.5
+++ src/frontends/qt2/ui/moc/Makefile.am 2002/03/01 17:01:48
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign 1.4
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2uimoc.o
+noinst_LTLIBRARIES = libqt2uimoc.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \
@@ -12,7 +12,7 @@
include ../../Makefile.dialogs
-libqt2uimoc_o_SOURCES := $(UIMOCDIALOGS)
+libqt2uimoc_la_SOURCES := $(UIMOCDIALOGS)
DISTCLEANFILES = $(libqt2uimoc_la_SOURCES) *.orig *.rej *~ *.bak core
Index: src/frontends/xforms/FormDocument.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormDocument.C,v
retrieving revision 1.85
diff -u -r1.85 FormDocument.C
--- src/frontends/xforms/FormDocument.C 2002/02/16 15:59:49 1.85
+++ src/frontends/xforms/FormDocument.C 2002/03/01 17:01:52
@@ -18,6 +18,7 @@
#pragma implementation
#endif
+#include "ButtonController.tmpl"
#include "FormDocument.h"
#include "form_document.h"
#include "Alert.h"
Index: src/frontends/xforms/FormParagraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormParagraph.C,v
retrieving revision 1.53
diff -u -r1.53 FormParagraph.C
--- src/frontends/xforms/FormParagraph.C 2002/02/18 10:08:41 1.53
+++ src/frontends/xforms/FormParagraph.C 2002/03/01 17:01:54
@@ -17,6 +17,8 @@
#include FORMS_H_LOCATION
+#include "ButtonController.tmpl"
+
#include "FormParagraph.h"
#include "form_paragraph.h"
#include "Dialogs.h"
