X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=7c90cf2cee41da6bdf498d7456646867db20f0f5;hb=2417d9d911dbca181c48f45d1aad26d31c9aa815;hp=d21fd4a8a0ef7ca7a6f036203d6b17eca8d628f8;hpb=40e4ab9bf3fe01ed763e06df40cfc19b69369cfa;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index d21fd4a8a0..7c90cf2cee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,16 +1,16 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += config.h libintl.h version.C stamp-version version.C-tmp
+############################### Core  ##############################
+
+DISTCLEANFILES += config.h libintl.h
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
-if BUILD_CLIENT_SUBDIR
-CLIENT = client
-endif
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
 
-SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
+SUBDIRS = support frontends .
 
-EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
+EXTRA_DIST = config.h.in \
 	Section.h \
 	Section.cpp \
 	Variables.cpp \
@@ -18,34 +18,32 @@ EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
 	paper.h \
 	pch.h
 
-LYX_PRE_LIBS = mathed/libmathed.la insets/libinsets.la \
-	frontends/libfrontends.la
-
-LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
-	graphics/libgraphics.la \
-	support/libsupport.la
-
-BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS)
-
-OTHERLIBS = $(BOOST_LIBS) $(LIBICONV) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
+pkglib_LTLIBRARIES = liblyxcore.la
 bin_PROGRAMS = lyx
-noinst_PROGRAMS = $(FRONTENDS_PROGS)
-EXTRA_PROGRAMS = lyx-qt4
 
-lyx_qt4_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-	frontends/qt4/libqt4.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_qt4_SOURCES = main.cpp
+lyx_LDADD = \
+	liblyxcore.la \
+	liblyxmathed.la \
+	liblyxinsets.la \
+	frontends/liblyxfrontends.la \
+	frontends/qt4/liblyxqt4.la \
+	frontends/controllers/liblyxcontrollers.la \
+	liblyxgraphics.la \
+	support/liblyxsupport.la \
+	$(OTHERLIBS) \
+	$(QT4_LIB) 
 
-lyx$(EXEEXT): $(FRONTENDS_PROGS)
-	rm -f $@
-	$(LN_S) $< $@
+if LYX_WIN_RESOURCE
+.rc.o:
+	cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico .
+	windres -I. --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
+endif
 
 #lyx_LDFLAGS=-Wl,-O1
 
-BUILT_SOURCES = $(PCH_FILE) version.C
-
-AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES)
+BUILT_SOURCES = $(PCH_FILE)
 
 if USE_ASPELL
 ASPELL = ASpell.cpp ASpell_local.h
@@ -57,17 +55,34 @@ if USE_ISPELL
 ISPELL = ISpell.cpp ISpell.h
 endif
 
-
-
+# These four objects are linked as object files as they are not
+# referenced within the core and therefore are not picked up
+# by the linker without looping over libs. We do not want that,
+# and in fact libtools seems not able to do that.
 lyx_SOURCES = \
+	main.cpp \
 	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+	Box.cpp \
+	Box.h \
+	Dimension.cpp \
+	Dimension.h \
+	PrinterParams.cpp \
+	PrinterParams.h \
+	Thesaurus.cpp \
+	Thesaurus.h
+
+if LYX_WIN_RESOURCE
+lyx_SOURCES += lyxwinres.rc
+endif
+
+liblyxcore_la_SOURCES = \
 	Author.cpp \
 	Author.h \
+	BiblioInfo.h \
+	BiblioInfo.cpp \
 	Bidi.cpp \
 	Bidi.h \
 	boost.cpp \
-	Box.cpp \
-	Box.h \
 	BranchList.cpp \
 	BranchList.h \
 	Buffer.cpp \
@@ -109,11 +124,11 @@ lyx_SOURCES = \
 	debug.h \
 	DepTable.cpp \
 	DepTable.h \
-	Dimension.cpp \
-	Dimension.h \
 	DispatchResult.h \
 	DocIterator.cpp \
 	DocIterator.h \
+	EmbeddedFiles.h \
+	EmbeddedFiles.cpp \
 	Encoding.cpp \
 	Encoding.h \
 	ErrorList.cpp \
@@ -152,7 +167,6 @@ lyx_SOURCES = \
 	KeyMap.h \
 	KeySequence.cpp \
 	KeySequence.h \
-	KmodInfo.h \
 	Language.cpp \
 	Language.h \
 	LaTeX.cpp \
@@ -193,6 +207,8 @@ lyx_SOURCES = \
 	Messages.h \
 	MetricsInfo.cpp \
 	MetricsInfo.h \
+	ModuleList.cpp \
+	ModuleList.h \
 	Mover.cpp \
 	Mover.h \
 	output.cpp \
@@ -210,7 +226,6 @@ lyx_SOURCES = \
 	paragraph_funcs.cpp \
 	paragraph_funcs.h \
 	Paragraph.h \
-	ParagraphList_fwd.h \
 	ParagraphList.h \
 	ParagraphMetrics.cpp \
 	ParagraphMetrics.h \
@@ -218,11 +233,10 @@ lyx_SOURCES = \
 	ParagraphParameters.h \
 	ParIterator.cpp \
 	ParIterator.h \
-	PrinterParams.cpp \
-	PrinterParams.h \
+	PDFOptions.cpp \
+	PDFOptions.h \
 	Row.cpp \
 	Row.h \
-	RowList_fwd.h \
 	rowpainter.cpp \
 	rowpainter.h \
 	Session.cpp \
@@ -232,10 +246,10 @@ lyx_SOURCES = \
 	Spacing.cpp \
 	Spacing.h \
 	SpellBase.h \
-	tex-accent.cpp \
-	tex-accent.h \
 	TexRow.cpp \
 	TexRow.h \
+	TexStream.cpp \
+	TexStream.h \
 	Text.h \
 	Text.cpp \
 	Text2.cpp \
@@ -246,8 +260,6 @@ lyx_SOURCES = \
 	TextClassList.h \
 	TextMetrics.cpp \
 	TextMetrics.h \
-	Thesaurus.cpp \
-	Thesaurus.h \
 	TocBackend.cpp \
 	TocBackend.h \
 	toc.cpp \
@@ -256,27 +268,312 @@ lyx_SOURCES = \
 	ToolbarBackend.h \
 	Trans.cpp \
 	Trans.h \
-	TransState.cpp \
-	TransState.h \
 	Undo.cpp \
 	Undo.h \
 	update_flags.h \
 	VCBackend.cpp \
 	VCBackend.h \
-	version.C \
+	version.cpp \
 	version.h \
 	WordLangTuple.h \
 	VSpace.cpp \
 	VSpace.h
+############################### Graphics ##############################
+
+pkglib_LTLIBRARIES += liblyxgraphics.la
+
+liblyxgraphics_la_SOURCES = \
+	graphics/GraphicsCache.h \
+	graphics/GraphicsCache.cpp \
+	graphics/GraphicsCacheItem.h \
+	graphics/GraphicsCacheItem.cpp \
+	graphics/GraphicsConverter.h \
+	graphics/GraphicsConverter.cpp \
+	graphics/GraphicsImage.h \
+	graphics/GraphicsImage.cpp \
+	graphics/GraphicsLoader.h \
+	graphics/GraphicsLoader.cpp \
+	graphics/GraphicsParams.cpp \
+	graphics/GraphicsParams.h \
+	graphics/LoaderQueue.h \
+	graphics/LoaderQueue.cpp \
+	graphics/GraphicsTypes.h \
+	graphics/GraphicsTypes.cpp \
+	graphics/PreviewImage.h \
+	graphics/PreviewImage.cpp \
+	graphics/PreviewLoader.h \
+	graphics/PreviewLoader.cpp \
+	graphics/Previews.h \
+	graphics/Previews.cpp
+
+
+############################### Mathed  ##############################
+
+EXTRA_DIST += mathed/InsetFormulaMacro.cpp
+
+pkglib_LTLIBRARIES += liblyxmathed.la
+
+liblyxmathed_la_SOURCES = \
+	mathed/InsetMathAMSArray.cpp \
+	mathed/InsetMathAMSArray.h \
+	mathed/InsetMathArray.cpp \
+	mathed/InsetMathArray.h \
+	mathed/InsetMathBig.cpp \
+	mathed/InsetMathBig.h \
+	mathed/InsetMathBinom.cpp \
+	mathed/InsetMathBinom.h \
+	mathed/InsetMathBoldSymbol.cpp \
+	mathed/InsetMathBoldSymbol.h \
+	mathed/InsetMathBox.cpp \
+	mathed/InsetMathBoxed.cpp \
+	mathed/InsetMathBoxed.h \
+	mathed/InsetMathBox.h \
+	mathed/InsetMathBrace.cpp \
+	mathed/InsetMathBrace.h \
+	mathed/InsetMath.cpp \
+	mathed/InsetMathCases.cpp \
+	mathed/InsetMathCases.h \
+	mathed/InsetMathChar.cpp \
+	mathed/InsetMathChar.h \
+	mathed/InsetMathColor.cpp \
+	mathed/InsetMathColor.h \
+	mathed/CommandInset.cpp \
+	mathed/CommandInset.h \
+	mathed/InsetMathComment.cpp \
+	mathed/InsetMathComment.h \
+	mathed/InsetMathDecoration.cpp \
+	mathed/InsetMathDecoration.h \
+	mathed/InsetMathDelim.cpp \
+	mathed/InsetMathDelim.h \
+	mathed/InsetMathDFrac.cpp \
+	mathed/InsetMathDFrac.h \
+	mathed/InsetMathDiff.cpp \
+	mathed/InsetMathDiff.h \
+	mathed/InsetMathDots.cpp \
+	mathed/InsetMathDots.h \
+	mathed/InsetMathEnv.cpp \
+	mathed/InsetMathEnv.h \
+	mathed/InsetMathExFunc.cpp \
+	mathed/InsetMathExFunc.h \
+	mathed/InsetMathExInt.cpp \
+	mathed/InsetMathExInt.h \
+	mathed/InsetMathFBox.cpp \
+	mathed/InsetMathFBox.h \
+	mathed/InsetMathFont.cpp \
+	mathed/InsetMathFont.h \
+	mathed/InsetMathFontOld.cpp \
+	mathed/InsetMathFontOld.h \
+	mathed/InsetMathFracBase.cpp \
+	mathed/InsetMathFracBase.h \
+	mathed/InsetMathFrac.cpp \
+	mathed/InsetMathFrac.h \
+	mathed/InsetMathFrameBox.cpp \
+	mathed/InsetMathFrameBox.h \
+	mathed/InsetMathGrid.cpp \
+	mathed/InsetMathGrid.h \
+	mathed/InsetMath.h \
+	mathed/InsetMathHull.cpp \
+	mathed/InsetMathHull.h \
+	mathed/InsetMathKern.cpp \
+	mathed/InsetMathKern.h \
+	mathed/InsetMathLefteqn.cpp \
+	mathed/InsetMathLefteqn.h \
+	mathed/InsetMathLim.cpp \
+	mathed/InsetMathLim.h \
+	mathed/MathMacro.cpp \
+	mathed/MathMacro.h \
+	mathed/InsetMathMakebox.cpp \
+	mathed/InsetMathMakebox.h \
+	mathed/InsetMathMatrix.cpp \
+	mathed/InsetMathMatrix.h \
+	mathed/InsetMathNest.cpp \
+	mathed/InsetMathNest.h \
+	mathed/InsetMathNumber.cpp \
+	mathed/InsetMathNumber.h \
+	mathed/InsetMathOverset.cpp \
+	mathed/InsetMathOverset.h \
+	mathed/InsetMathPar.cpp \
+	mathed/InsetMathPar.h \
+	mathed/InsetMathPhantom.cpp \
+	mathed/InsetMathPhantom.h \
+	mathed/InsetMathRef.cpp \
+	mathed/InsetMathRef.h \
+	mathed/InsetMathRoot.cpp \
+	mathed/InsetMathRoot.h \
+	mathed/InsetMathScript.cpp \
+	mathed/InsetMathScript.h \
+	mathed/InsetMathSize.cpp \
+	mathed/InsetMathSize.h \
+	mathed/InsetMathSpace.cpp \
+	mathed/InsetMathSpace.h \
+	mathed/InsetMathSplit.cpp \
+	mathed/InsetMathSplit.h \
+	mathed/InsetMathSqrt.cpp \
+	mathed/InsetMathSqrt.h \
+	mathed/InsetMathStackrel.cpp \
+	mathed/InsetMathStackrel.h \
+	mathed/InsetMathString.cpp \
+	mathed/InsetMathString.h \
+	mathed/InsetMathSubstack.cpp \
+	mathed/InsetMathSubstack.h \
+	mathed/InsetMathSymbol.cpp \
+	mathed/InsetMathSymbol.h \
+	mathed/InsetMathTabular.cpp \
+	mathed/InsetMathTabular.h \
+	mathed/InsetMathTFrac.cpp \
+	mathed/InsetMathTFrac.h \
+	mathed/InsetMathUnderset.cpp \
+	mathed/InsetMathUnderset.h \
+	mathed/InsetMathUnknown.cpp \
+	mathed/InsetMathUnknown.h \
+	mathed/InsetMathXArrow.cpp \
+	mathed/InsetMathXArrow.h \
+	mathed/InsetMathXYMatrix.cpp \
+	mathed/InsetMathXYMatrix.h \
+	mathed/MathAtom.cpp \
+	mathed/MathAtom.h \
+	mathed/MathAutoCorrect.cpp \
+	mathed/MathAutoCorrect.h \
+	mathed/MathData.cpp \
+	mathed/MathData.h \
+	mathed/MathExtern.cpp \
+	mathed/MathExtern.h \
+	mathed/MathFactory.cpp \
+	mathed/MathFactory.h \
+	mathed/MathGridInfo.h \
+	mathed/MathMacroArgument.cpp \
+	mathed/MathMacroArgument.h \
+	mathed/MacroTable.cpp \
+	mathed/MacroTable.h \
+	mathed/MathMacroTemplate.cpp \
+	mathed/MathMacroTemplate.h \
+	mathed/MathParser.cpp \
+	mathed/MathParser.h \
+	mathed/ReplaceData.h \
+	mathed/MathStream.cpp \
+	mathed/MathStream.h \
+	mathed/MathSupport.cpp \
+	mathed/MathSupport.h \
+	mathed/TextPainter.cpp \
+	mathed/TextPainter.h 
+#	mathed/InsetMathMBox.cpp
+#	mathed/InsetMathMBox.h
+
+############################### Insets  ##############################
+
+pkglib_LTLIBRARIES += liblyxinsets.la
+
+EXTRA_DIST += \
+	insets/InsetTheorem.cpp \
+	insets/InsetTheorem.h
+
+liblyxinsets_la_SOURCES = \
+	insets/MailInset.cpp \
+	insets/MailInset.h \
+	insets/ExternalSupport.cpp \
+	insets/ExternalSupport.h \
+	insets/ExternalTemplate.cpp \
+	insets/ExternalTemplate.h \
+	insets/ExternalTransforms.cpp \
+	insets/ExternalTransforms.h \
+	insets/RenderBase.h \
+	insets/RenderButton.cpp \
+	insets/RenderButton.h \
+	insets/RenderGraphic.cpp \
+	insets/RenderGraphic.h \
+	insets/RenderPreview.cpp \
+	insets/RenderPreview.h \
+	insets/Inset.h \
+	insets/Inset.cpp \
+	insets/InsetBibitem.cpp \
+	insets/InsetBibitem.h \
+	insets/InsetBibtex.cpp \
+	insets/InsetBibtex.h \
+	insets/InsetBox.cpp \
+	insets/InsetBox.h \
+	insets/InsetBranch.cpp \
+	insets/InsetBranch.h \
+	insets/InsetCaption.cpp \
+	insets/InsetCaption.h \
+	insets/InsetCitation.cpp \
+	insets/InsetCitation.h \
+	insets/InsetCollapsable.cpp \
+	insets/InsetCollapsable.h \
+	insets/InsetCommand.cpp \
+	insets/InsetCommand.h \
+	insets/InsetCommandParams.cpp \
+	insets/InsetCommandParams.h \
+	insets/InsetEnvironment.cpp \
+	insets/InsetEnvironment.h \
+	insets/InsetERT.cpp \
+	insets/InsetERT.h \
+	insets/InsetExternal.cpp \
+	insets/InsetExternal.h \
+	insets/InsetFlex.h \
+	insets/InsetFlex.cpp \
+	insets/InsetFloat.h \
+	insets/InsetFloat.cpp \
+	insets/InsetFloatList.cpp \
+	insets/InsetFloatList.h \
+	insets/InsetFoot.cpp \
+	insets/InsetFoot.h \
+	insets/InsetFootlike.cpp \
+	insets/InsetFootlike.h \
+	insets/InsetGraphicsParams.h \
+	insets/InsetGraphicsParams.cpp \
+	insets/InsetGraphics.cpp \
+	insets/InsetGraphics.h \
+	insets/InsetHFill.cpp \
+	insets/InsetHFill.h \
+	insets/InsetInclude.cpp \
+	insets/InsetInclude.h \
+	insets/InsetIndex.cpp \
+	insets/InsetIndex.h \
+	insets/InsetLabel.cpp \
+	insets/InsetLabel.h \
+	insets/InsetLine.cpp \
+	insets/InsetLine.h \
+	insets/InsetListings.h \
+	insets/InsetListings.cpp \
+	insets/InsetListingsParams.h \
+	insets/InsetListingsParams.cpp \
+	insets/InsetMarginal.h \
+	insets/InsetMarginal.cpp \
+	insets/InsetNewline.cpp \
+	insets/InsetNewline.h \
+	insets/InsetNomencl.cpp \
+	insets/InsetNomencl.h \
+	insets/InsetNote.cpp \
+	insets/InsetNote.h \
+	insets/InsetOptArg.cpp \
+	insets/InsetOptArg.h \
+	insets/InsetPagebreak.cpp \
+	insets/InsetPagebreak.h \
+	insets/InsetQuotes.cpp \
+	insets/InsetQuotes.h \
+	insets/InsetRef.cpp \
+	insets/InsetRef.h \
+	insets/InsetSpace.cpp \
+	insets/InsetSpace.h \
+	insets/InsetSpecialChar.cpp \
+	insets/InsetSpecialChar.h \
+	insets/InsetTabular.cpp \
+	insets/InsetTabular.h \
+	insets/InsetText.cpp \
+	insets/InsetText.h \
+	insets/InsetTOC.cpp \
+	insets/InsetTOC.h \
+	insets/InsetUrl.cpp \
+	insets/InsetUrl.h \
+	insets/InsetVSpace.cpp \
+	insets/InsetVSpace.h \
+	insets/InsetWrap.h \
+	insets/InsetWrap.cpp
 
-version.C: stamp-version
-	@:
+#	insets/insetlist.C \
+#	insets/insetlist.h \
+#	insets/insetsection.h \
+#	insets/insetsection.C \
+#	insets/InsetTheorem.cpp \
+#	insets/InsetTheorem.h
 
-stamp-version: version.C-tmp
-	if cmp -s $< version.C ; then \
-		: ;\
-	else \
-		rm -f version.C ;\
-		cp $< version.C ;\
-	fi
-	echo timestamp > $@