X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=dbe1fcee82f0a438ad4440ee249e58db32f5ef0e;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=6b556d44d14584a76323fbc43671321c174f1f10;hpb=201e5bdf707317be29e9b7476e2b97a34e2d0b48;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 6b556d44d1..dbe1fcee82 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,8 @@ EXTRA_DIST = config.h.in stamp-h.in version.C.in \
 	Sectioning.C \
 	Variables.C \
 	Variables.h \
-	paper.h
+	paper.h \
+	pch.h
 
 LYX_PRE_LIBS = mathed/libmathed.la insets/libinsets.la \
 	frontends/libfrontends.la
@@ -24,26 +25,17 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
 	graphics/libgraphics.la \
 	support/libsupport.la
 
-BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM)
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS)
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @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_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/qt2/libqt2.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_qt_SOURCES = main.C
+EXTRA_PROGRAMS = lyx-qt4
 
-lyx_gtk_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-	frontends/gtk/libgtk.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_gtk_SOURCES = main.C
+lyx_qt4_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
+	frontends/qt4/libqt4.la $(LYX_POST_LIBS) $(OTHERLIBS)
+lyx_qt4_SOURCES = main.C
 
 lyx$(EXEEXT): $(FRONTENDS_PROGS)
 	rm -f $@
@@ -51,9 +43,9 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-BUILT_SOURCES = version.C
+BUILT_SOURCES = $(PCH_FILE) version.C
 
-AM_CPPFLAGS = $(PCH_FLAGS) $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES)
 
 if USE_ASPELL
 ASPELL = aspell.C aspell_local.h
@@ -72,14 +64,16 @@ lyx_SOURCES = \
 	Bidi.h \
 	BufferView.C \
 	BufferView.h \
-	BufferView_pimpl.C \
-	BufferView_pimpl.h \
 	Bullet.C \
 	Bullet.h \
 	BranchList.C \
 	BranchList.h \
 	Chktex.C \
 	Chktex.h \
+	Color.C \
+	Color.h \
+	ConverterCache.C \
+	ConverterCache.h \
 	CutAndPaste.C \
 	CutAndPaste.h \
 	DepTable.C \
@@ -104,6 +98,7 @@ lyx_SOURCES = \
 	LyXAction.h \
 	MenuBackend.C \
 	MenuBackend.h \
+	ParagraphList.h \
 	ParagraphList_fwd.h \
 	ParagraphParameters.C \
 	ParagraphParameters.h \
@@ -182,8 +177,8 @@ lyx_SOURCES = \
 	kbsequence.h \
 	language.C \
 	language.h \
-	lastfiles.C \
-	lastfiles.h \
+	session.C \
+	session.h \
 	layout.h \
 	lengthcommon.C \
 	lengthcommon.h \
@@ -215,8 +210,6 @@ lyx_SOURCES = \
 	lyxrc.h \
 	lyxrow.C \
 	lyxrow.h \
-	lyxrow_funcs.C \
-	lyxrow_funcs.h \
 	lyxserver.C \
 	lyxserver.h \
 	lyxsocket.C \
@@ -242,8 +235,6 @@ 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 \
@@ -272,6 +263,8 @@ lyx_SOURCES = \
 	text.C \
 	text2.C \
 	text3.C \
+	TocBackend.C \
+	TocBackend.h \
 	toc.C \
 	toc.h \
 	trans.C \