gnome build removal, gtk build fix

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

diff --git a/ChangeLog b/ChangeLog
index 2fb6184bc7e1ad0b6a4cfc0726ddc5f81e6780d3..07bf5681f8c6f5537f13a66e29e4dad6ba7c1709 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-06  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * configure.ac: make the xforms part be built
+       first when building gtk frontend 
+
 2005-03-05  Angus Leeming  <leeming@lyx.org>
 
        * autogen.sh: remove test for gettext. Belongs in configure.

diff --git a/configure.ac b/configure.ac
index 63c859a5c0f4bd3b10fc94f6e6f2d3384f7d2692..22d7a7e52a982678a4516dba290048ded78d46e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -161,7 +161,7 @@ esac
 
 dnl if the gtk frontend has been specified, then xforms is needed too
 if echo $FRONTENDS | grep gtk | grep -v xforms ; then
-  FRONTENDS="$FRONTENDS xforms"
+  FRONTENDS="xforms $FRONTENDS"
 fi
 
 dnl The code below is not in a macro, because this would cause big

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 77955ee2bbaab3cd22b8f61b8a9497d39579de49..362d109c56733888222de7b5f538ac5c06d9e994 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,6 +1,10 @@
+2005-03-06  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * Makefile.am (DIST_SUBDIRS): remove gnome
+
 2005-02-21  Andreas Vox  <vox@isp.uni-luebeck.de>
 
-       * Dialogs.[hC] (show): prevent show() from getting called 
+       * Dialogs.[hC] (show): prevent show() from getting called
        recursively.
 
 2005-02-11  John Levon  <levon@movementarian.org>

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index 74d2f42f271d9b86b0890f0dbc1d5c830a986515..14a6613d3f542f49a64366a2a1cbe69d72a2e705 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 SUBDIRS = controllers $(FRONTENDS_SUBDIRS)
 
-DIST_SUBDIRS = controllers xforms qt2 gnome gtk
+DIST_SUBDIRS = controllers xforms qt2 gtk
 
 noinst_LTLIBRARIES = libfrontends.la