qt2.diff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3635 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index db6d8715d0bae300b348e8c6d11291c1110e1e12..8d1ff3b222bdf894d2ae94c6523779b68e1c06fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-01  John Levon  <moz@compsoc.man.ac.uk>
+
+       * configure.in: fixup qt2
+ 
 2002-02-27  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * configure.in: don't compile src/frontends/support as LyXImage is

diff --git a/configure.in b/configure.in
index 32f1f300517b45dbbc40c10bf487fcb3628700d9..fc2111a1869bb6fc3cc332e0726693e4f559ffc3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -189,7 +189,7 @@ case "$lyx_use_frontend" in
     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,10 +213,10 @@ dnl Ensure gnome-config is available...
     FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
   qt2)
     QT2_DO_IT_ALL
-    FRONTEND="xforms qt2"
-    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo ui/moc/*.lo"
+    FRONTEND="qt2"
+    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
     FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
-    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
+    FRONTEND_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
     FRONTEND_LIBS="\$(QT2_LIBS)";;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
@@ -349,6 +349,7 @@ AC_OUTPUT([Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/xforms/Makefile \
        src/frontends/qt2/Makefile \
+       src/frontends/qt2/xforms/Makefile \
        src/frontends/qt2/moc/Makefile \
        src/frontends/qt2/ui/Makefile \
        src/frontends/qt2/ui/moc/Makefile \

diff --git a/src/ChangeLog b/src/ChangeLog
index 8864bbaa6c5c16548716572e2aea104665cb1fb1..fb636533cbfd7d67aad1eb79542a4ec56c954f0f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-01  John Levon  <moz@compsoc.man.ac.uk>
+
+       * Makefile.am: use FRONTEND_*
+ 
 2002-03-01  Juergen Vigna  <jug@sad.it>
 
        * tabular.C (SetWidthOfMulticolCell): changed to something better

diff --git a/src/Makefile.am b/src/Makefile.am
index 3cee61c5f36cf86a27353200b428131c793659e7..20603f5debfe41f7b2f3a9de8749ad8fb9731a5d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \
        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 \