X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=247d37b6a3686577367a5ddb3ade20ed43b3bd57;hb=d4f8fe124906af839a02d1ad3b7894e14fb69a37;hp=7519df98aaeea9321c7b8b5060f6324346673e3b;hpb=eefc9ad640ae716b409403e536fca56f94aa01d2;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 7519df98aa..247d37b6a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,29 +27,16 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
 
 BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS)
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
+OTHERLIBS = $(BOOST_LIBS) $(LIBICONV) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
 bin_PROGRAMS = lyx
 noinst_PROGRAMS = $(FRONTENDS_PROGS)
-EXTRA_PROGRAMS = lyx-xforms lyx-qt lyx-gtk lyx-qt4
-
-lyx_xforms_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-	frontends/xforms/libxforms.la $(LYX_POST_LIBS) $(OTHERLIBS)
-
-lyx_xforms_SOURCES = main.C
-
-lyx_qt_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-	frontends/qt3/libqt3.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_qt_SOURCES = main.C
+EXTRA_PROGRAMS = lyx-qt4
 
 lyx_qt4_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
 	frontends/qt4/libqt4.la $(LYX_POST_LIBS) $(OTHERLIBS)
 lyx_qt4_SOURCES = main.C
 
-lyx_gtk_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-	frontends/gtk/libgtk.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_gtk_SOURCES = main.C
-
 lyx$(EXEEXT): $(FRONTENDS_PROGS)
 	rm -f $@
 	$(LN_S) $< $@
@@ -77,8 +64,6 @@ lyx_SOURCES = \
 	Bidi.h \
 	BufferView.C \
 	BufferView.h \
-	BufferView_pimpl.C \
-	BufferView_pimpl.h \
 	Bullet.C \
 	Bullet.h \
 	BranchList.C \
@@ -87,6 +72,8 @@ lyx_SOURCES = \
 	Chktex.h \
 	Color.C \
 	Color.h \
+	ConverterCache.C \
+	ConverterCache.h \
 	CutAndPaste.C \
 	CutAndPaste.h \
 	DepTable.C \
@@ -124,6 +111,7 @@ lyx_SOURCES = \
 	Thesaurus.h \
 	ToolbarBackend.C \
 	ToolbarBackend.h \
+	UpdateFlags.h \
 	WordLangTuple.h \
 	author.C \
 	author.h \
@@ -223,8 +211,6 @@ lyx_SOURCES = \
 	lyxrc.h \
 	lyxrow.C \
 	lyxrow.h \
-	lyxrow_funcs.C \
-	lyxrow_funcs.h \
 	lyxserver.C \
 	lyxserver.h \
 	lyxsocket.C \
@@ -250,13 +236,13 @@ lyx_SOURCES = \
 	output_docbook.h \
 	output_latex.C \
 	output_latex.h \
-	output_linuxdoc.C \
-	output_linuxdoc.h \
 	output_plaintext.C \
 	output_plaintext.h \
 	paper.h \
 	paragraph.C \
 	paragraph.h \
+	ParagraphMetrics.C \
+	ParagraphMetrics.h \
 	paragraph_funcs.C \
 	paragraph_funcs.h \
 	paragraph_pimpl.C \
@@ -280,6 +266,8 @@ lyx_SOURCES = \
 	text.C \
 	text2.C \
 	text3.C \
+	TextMetrics.C \
+	TextMetrics.h \
 	TocBackend.C \
 	TocBackend.h \
 	toc.C \