X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=88b1e11e4911978f29f01e3483b3e3841dc3ab09;hb=2455bc258f3b62c29ec4a41cb88070ff8518e842;hp=715e6ae2c700312f081f70c5edbd0448793c738b;hpb=8a69ffd3bfaa4ab23b281a38b9a65f0a8550c997;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 715e6ae2c7..88b1e11e49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,14 +4,15 @@ include $(top_srcdir)/config/common.am
 
 DISTCLEANFILES += config.h libintl.h
 
-MAINTAINERCLEANFILES += $(srcdir)/config.h.in
-
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
 
-SUBDIRS = support frontends tex2lyx client .
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = config.h.in \
-	Section.h \
+EXTRA_DIST = Section.h \
 	Section.cpp \
 	Variables.cpp \
 	Variables.h \
@@ -61,6 +62,8 @@ endif
 lyx_SOURCES = \
 	main.cpp \
 	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+	BiblioInfo.h \
+	BiblioInfo.cpp \
 	Box.cpp \
 	Box.h \
 	Dimension.cpp \
@@ -76,7 +79,6 @@ endif
 
 SOURCEFILESCORE = \
 	Author.cpp \
-	BiblioInfo.cpp \
 	Bidi.cpp \
 	boost.cpp \
 	BranchList.cpp \
@@ -159,7 +161,6 @@ SOURCEFILESCORE = \
 	TextClass.cpp \
 	TextMetrics.cpp \
 	TocBackend.cpp \
-	ToolbarBackend.cpp \
 	Trans.cpp \
 	Undo.cpp \
 	VCBackend.cpp \
@@ -169,7 +170,6 @@ SOURCEFILESCORE = \
 
 HEADERFILESCORE = \
 	Author.h \
-	BiblioInfo.h \
 	Bidi.h \
 	BranchList.h \
 	buffer_funcs.h \
@@ -178,13 +178,13 @@ HEADERFILESCORE = \
 	BufferParams.h \
 	BufferView.h \
 	Bullet.h \
+	Citation.h \
 	Changes.h \
 	Chktex.h \
 	CmdDef.h \
 	ColorCode.h \
 	Color.h \
 	CompletionList.h \
-	config.h.in \
 	ConverterCache.h \
 	Converter.h \
 	CoordCache.h \
@@ -259,7 +259,6 @@ HEADERFILESCORE = \
 	TextClass.h \
 	TextMetrics.h \
 	TocBackend.h \
-	ToolbarBackend.h \
 	Trans.h \
 	Undo.h \
 	update_flags.h \
@@ -307,7 +306,6 @@ liblyxgraphics_la_SOURCES = \
 	graphics/GraphicsParams.cpp \
 	graphics/GraphicsParams.h \
 	graphics/GraphicsTypes.h \
-	graphics/GraphicsTypes.cpp \
 	graphics/PreviewImage.h \
 	graphics/PreviewImage.cpp \
 	graphics/PreviewLoader.h \
@@ -490,7 +488,6 @@ SOURCEFILESINSETS = \
 	insets/InsetCollapsable.cpp \
 	insets/InsetCommand.cpp \
 	insets/InsetCommandParams.cpp \
-	insets/InsetEnvironment.cpp \
 	insets/InsetERT.cpp \
 	insets/InsetExternal.cpp \
 	insets/InsetFlex.cpp \
@@ -545,7 +542,6 @@ HEADERFILESINSETS = \
 	insets/InsetCommand.h \
 	insets/InsetCommandParams.h \
 	insets/InsetERT.h \
-	insets/InsetEnvironment.h \
 	insets/InsetExternal.h \
 	insets/InsetFlex.h \
 	insets/InsetFloat.h \