> > btw in addition i use --enable-monolithic-insets and still see many
> > insets/Inset*.cpp compiled individually. is it supposed to be this way?
>
> For some reason the feature seems to be gone?
it seems that for some reason this and few other monolithic features have
never been implemented. this patch works for me as far as insets is concerned.
before i add mathed and core i'd like to ask about these lines in
e.g. src/client/Makefile.am which analogy i dont see in src/Makefile.am
EXTRA_DIST += pch.h
AM_CPPFLAGS += $(PCH_FLAGS)
BUILT_SOURCES = $(PCH_FILE)
should these be added to analogous else section of monolithic eg insets ?
pavel
diff --git a/config/install-sh b/config/install-sh
diff --git a/config/mkinstalldirs b/config/mkinstalldirs
diff --git a/src/Makefile.am b/src/Makefile.am
index 31b2162..e81422c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -449,112 +449,114 @@ EXTRA_DIST += \
insets/InsetTheorem.cpp \
insets/InsetTheorem.h
-liblyxinsets_la_SOURCES = \
+SOURCEFILES = \
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/InsetRef.cpp \
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/InsetCode.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/InsetHyperlink.cpp \
- insets/InsetHyperlink.h \
insets/InsetInclude.cpp \
- insets/InsetInclude.h \
insets/InsetIndex.cpp \
- insets/InsetIndex.h \
insets/InsetInfo.cpp \
- insets/InsetInfo.h \
insets/InsetLabel.cpp \
+ insets/InsetLine.cpp \
+ insets/InsetListings.cpp \
+ insets/InsetListingsParams.cpp \
+ insets/InsetMarginal.cpp \
+ insets/InsetNewline.cpp \
+ insets/InsetNomencl.cpp \
+ insets/InsetNote.cpp \
+ insets/InsetOptArg.cpp \
+ insets/InsetPagebreak.cpp \
+ insets/InsetQuotes.cpp \
+ insets/InsetSpace.cpp \
+ insets/InsetSpecialChar.cpp \
+ insets/InsetTabular.cpp \
+ insets/InsetText.cpp \
+ insets/InsetTOC.cpp \
+ insets/InsetVSpace.cpp \
+ insets/InsetWrap.cpp
+
+HEADERFILES = \
+ insets/MailInset.h \
+ insets/ExternalSupport.h \
+ insets/ExternalTemplate.h \
+ insets/ExternalTransforms.h \
+ insets/RenderBase.h \
+ insets/RenderButton.h \
+ insets/RenderGraphic.h \
+ insets/RenderPreview.h \
+ insets/Inset.h \
+ insets/InsetBibitem.h \
+ insets/InsetBibtex.h \
+ insets/InsetBox.h \
+ insets/InsetBranch.h \
+ insets/InsetCaption.h \
+ insets/InsetCitation.h \
+ insets/InsetCode.h \
+ insets/InsetCollapsable.h \
+ insets/InsetCommand.h \
+ insets/InsetCommandParams.h \
+ insets/InsetERT.h \
+ insets/InsetEnvironment.h \
+ insets/InsetExternal.h \
+ insets/InsetFlex.h \
+ insets/InsetFloat.h \
+ insets/InsetFoot.h \
+ insets/InsetFloatList.h \
+ insets/InsetFootlike.h \
+ insets/InsetGraphicsParams.h \
+ insets/InsetGraphics.h \
+ insets/InsetHFill.h \
+ insets/InsetHyperlink.h \
+ insets/InsetInclude.h \
+ insets/InsetIndex.h \
+ insets/InsetInfo.h \
insets/InsetLabel.h \
insets/InsetLayout.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/InsetVSpace.cpp \
insets/InsetVSpace.h \
- insets/InsetWrap.h \
- insets/InsetWrap.cpp
+ insets/InsetWrap.h
# insets/InsetList.cpp \
# insets/InsetList.h \
@@ -563,3 +565,17 @@ liblyxinsets_la_SOURCES = \
# insets/InsetTheorem.cpp \
# insets/InsetTheorem.h
+if MONOLITHIC_INSETS
+
+lyxinsets.cpp:
+ @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
+
+BUILT_SOURCES += lyxinsets.cpp
+
+liblyxinsets_la_SOURCES = lyxinsets.cpp $(HEADERFILES)
+
+else
+
+liblyxinsets_la_SOURCES = $(SOURCEFILES) $(HEADERFILES)
+
+endif
