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

diff --git a/src/Makefile.am b/src/Makefile.am
index d1a5bb06fd..247d37b6a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,22 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += config.h libintl.h
+DISTCLEANFILES += config.h libintl.h version.C stamp-version version.C-tmp
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
-SUBDIRS = mathed insets graphics support frontends tex2lyx
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
+EXTRA_DIST = config.h.in stamp-h.in version.C.in \
 	Sectioning.h \
 	Sectioning.C \
 	Variables.C \
 	Variables.h \
-	paper.h
+	paper.h \
+	pch.h
 
 LYX_PRE_LIBS = mathed/libmathed.la insets/libinsets.la \
 	frontends/libfrontends.la
@@ -20,31 +25,17 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
 	graphics/libgraphics.la \
 	support/libsupport.la
 
-if USE_INCLUDED_BOOST
-BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
-	../boost/libs/signals/src/libboostsignals.la
-else
-BOOST_LIBS = -lboost_regex -lboost_signals
-endif
+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
+EXTRA_PROGRAMS = 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/qt2/libqt2.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_qt_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_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 $@
@@ -52,23 +43,37 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-INCLUDES = $(BOOST_INCLUDES)
+BUILT_SOURCES = $(PCH_FILE) version.C
+
+AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES)
+
+if USE_ASPELL
+ASPELL = aspell.C aspell_local.h
+endif
+if USE_PSPELL
+PSPELL = pspell.C pspell.h
+endif
+if USE_ISPELL
+ISPELL = ispell.C ispell.h
+endif
+
 
-BUILT_SOURCES = version.C
 
 lyx_SOURCES = \
 	Bidi.C \
 	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 \
@@ -77,6 +82,8 @@ lyx_SOURCES = \
 	FloatList.h \
 	Floating.C \
 	Floating.h \
+	FontIterator.C \
+	FontIterator.h \
 	FuncStatus.C \
 	FuncStatus.h \
 	InsetList.C \
@@ -91,29 +98,26 @@ lyx_SOURCES = \
 	LyXAction.h \
 	MenuBackend.C \
 	MenuBackend.h \
+	ParagraphList.h \
 	ParagraphList_fwd.h \
 	ParagraphParameters.C \
 	ParagraphParameters.h \
-	ParameterStruct.h \
 	PrinterParams.C \
 	PrinterParams.h \
 	RowList_fwd.h \
-	ShareContainer.h \
 	Spacing.C \
 	Spacing.h \
 	Thesaurus.C \
 	Thesaurus.h \
 	ToolbarBackend.C \
 	ToolbarBackend.h \
+	UpdateFlags.h \
 	WordLangTuple.h \
-	aspell.C \
-	aspell_local.h \
 	author.C \
 	author.h \
 	boost.C \
 	box.h \
 	box.C \
-	broken_headers.h \
 	buffer.C \
 	buffer.h \
 	buffer_funcs.C \
@@ -128,18 +132,23 @@ lyx_SOURCES = \
 	changes.h \
 	chset.C \
 	chset.h \
-	lfuns.h \
 	config.h.in \
 	converter.C \
 	converter.h \
 	counters.C \
 	counters.h \
+	coordcache.C \
+	coordcache.h \
 	cursor.C \
 	cursor.h \
+	cursor_slice.C \
+	cursor_slice.h \
 	debug.C \
 	debug.h \
 	dimension.C \
 	dimension.h \
+	dociterator.C \
+	dociterator.h \
 	dispatchresult.h \
 	encoding.C \
 	encoding.h \
@@ -161,27 +170,26 @@ lyx_SOURCES = \
 	importer.h \
 	intl.C \
 	intl.h \
-	iterators.C \
-	iterators.h \
+	insetiterator.C \
+	insetiterator.h \
 	kbmap.C \
 	kbmap.h \
 	kbsequence.C \
 	kbsequence.h \
 	language.C \
 	language.h \
-	lastfiles.C \
-	lastfiles.h \
+	session.C \
+	session.h \
 	layout.h \
 	lengthcommon.C \
 	lengthcommon.h \
+	lfuns.h \
 	lyx_cb.C \
 	lyx_cb.h \
 	lyx_main.C \
 	lyx_main.h \
 	lyx_sty.C \
 	lyx_sty.h \
-	lyxcursor.C \
-	lyxcursor.h \
 	lyxfont.C \
 	lyxfont.h \
 	lyxfind.C \
@@ -203,8 +211,6 @@ lyx_SOURCES = \
 	lyxrc.h \
 	lyxrow.C \
 	lyxrow.h \
-	lyxrow_funcs.C \
-	lyxrow_funcs.h \
 	lyxserver.C \
 	lyxserver.h \
 	lyxsocket.C \
@@ -220,31 +226,31 @@ lyx_SOURCES = \
 	messages.h \
 	metricsinfo.C \
 	metricsinfo.h \
+	mover.C \
+	mover.h \
 	output.C \
 	output.h \
+	outputparams.C \
 	outputparams.h \
 	output_docbook.C \
 	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 \
 	paragraph_pimpl.h \
-	PosIterator.h \
-	PosIterator.C \
+	pariterator.C \
+	pariterator.h \
+	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.C \
 	SpellBase.h \
-	ispell.C \
-	ispell.h \
-	pspell.C \
-	pspell.h \
 	rowpainter.C \
 	rowpainter.h \
 	sgml.C \
@@ -260,10 +266,10 @@ lyx_SOURCES = \
 	text.C \
 	text2.C \
 	text3.C \
-	textcursor.C \
-	textcursor.h \
-	text_funcs.C \
-	text_funcs.h \
+	TextMetrics.C \
+	TextMetrics.h \
+	TocBackend.C \
+	TocBackend.h \
 	toc.C \
 	toc.h \
 	trans.C \
@@ -280,9 +286,6 @@ lyx_SOURCES = \
 	vspace.C \
 	vspace.h
 
-dist-hook:
-	cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`
-
 version.C: stamp-version
 	@: