From 31bfe0870f3b402eb60210918153f4a78a8ba964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Tue, 25 May 2004 23:45:52 +0000 Subject: [PATCH] makefile gtk fix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8778 a592a061-630c-0410-9148-cb99ea01b6c8 --- po/POTFILES.in | 1 + src/frontends/gtk/ChangeLog | 5 +++++ src/frontends/gtk/Makefile.am | 5 +---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1aaecd8ae3..6e837e3f78 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -187,6 +187,7 @@ src/output_plaintext.C src/paragraph.C src/rowpainter.C src/support/globbing.C +src/support/path_defines.C src/tex2lyx/lengthcommon.C src/text.C src/text2.C diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index c805285101..4f26fb9d96 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,8 @@ +2004-05-26 Lars Gullik Bjonnes + + * Makefile.am: dont create a separate xforms.lo use he files + directly when building libgtk instead. + 2004-05-19 Angus Leeming * Most files: wrap code up inside namespace lyx::frontend. diff --git a/src/frontends/gtk/Makefile.am b/src/frontends/gtk/Makefile.am index 9d585327e7..5d5898be93 100644 --- a/src/frontends/gtk/Makefile.am +++ b/src/frontends/gtk/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src \ -I$(top_srcdir)/src/frontends/xforms \ $(BOOST_INCLUDES) @GTK_FRONTEND_CFLAGS@ -libgtk_la_LIBADD = xforms.lo @GTK_FRONTEND_LIBS@ @XFORMS_LIBS@ +libgtk_la_LIBADD = $(xforms_objects) ../xforms/forms/*.lo @GTK_FRONTEND_LIBS@ @XFORMS_LIBS@ # Alphabetical order please. It makes it easier to figure out what's missing. libgtk_la_SOURCES = \ @@ -137,6 +137,3 @@ xforms_objects = \ # ../xforms/FormUrl.lo # ../xforms/FormTabularCreate.lo # ../xforms/FormMathsPanel.lo - -xforms.lo: $(xforms_objects) ../xforms/forms/*.lo - $(CXXLINK) $(xforms_objects) ../xforms/forms/*.lo