qt2.diff

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

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

configure.in

@@ -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 \

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

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 \