X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=28592fb0a2651057745c3d78dc5f13de2c3b20d4;hb=9e072d45f2a0b273588e93949090e47e60d8d4c0;hp=a0b2ebe2c607caed234ad57a794bdd2318044101;hpb=86ae7dad3fc1cad3744663d0da8034625dc9ffb1;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index a0b2ebe2c6..28592fb0a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ if BUILD_CLIENT_SUBDIR
 CLIENT = client
 endif
 
-SUBDIRS = support frontends . $(CLIENT) tex2lyx
+SUBDIRS = support frontends . $(CLIENT) tex2lyx convert
 
 EXTRA_DIST = lyx_commit_hash.h.in \
 	CMakeLists.txt \
@@ -134,7 +134,6 @@ SOURCEFILESCORE = \
 	FuncRequest.cpp \
 	FuncStatus.cpp \
 	Graph.cpp \
-	HSpace.cpp \
 	IndicesList.cpp \
 	InsetIterator.cpp \
 	InsetList.cpp \
@@ -237,7 +236,6 @@ HEADERFILESCORE = \
 	FuncRequest.h \
 	FuncStatus.h \
 	Graph.h \
-	HSpace.h \
 	IndicesList.h \
 	InsetIterator.h \
 	InsetList.h \
@@ -307,14 +305,14 @@ STANDALONEFILES = \
 
 .PHONY: update_commit_hash
 
-LCH_V_GEN = $(lch__v_GEN_@AM_V@)
-lch__v_GEN_ = $(lch__v_GEN_@AM_DEFAULT_V@)
-lch__v_GEN_0 = @echo "  GEN      lyx_commit_hash.h";
-lch__v_GEN_1 =
+LCH_V_CHK = $(lch__v_CHK_@AM_V@)
+lch__v_CHK_ = $(lch__v_CHK_@AM_DEFAULT_V@)
+lch__v_CHK_0 = @echo "  CHK      lyx_commit_hash.h";
+lch__v_CHK_1 =
 
 update_commit_hash:
-	rm -f hash-temp \
-	$(LCH_V_GEN)hash=`cd "$(top_srcdir)" && git log -1 --pretty=format:%H 2>/dev/null || echo none` ; \
+	$(LCH_V_CHK)rm -f hash-temp ; \
+	hash=`cd "$(top_srcdir)" && git log -1 --pretty=format:%H 2>/dev/null || echo none` ; \
 	sed s/@LYX_GIT_COMMIT_HASH@/$$hash/ "$(srcdir)"/lyx_commit_hash.h.in >hash-temp ; \
 	cmp -s lyx_commit_hash.h hash-temp || cp hash-temp lyx_commit_hash.h ; \
 	rm -f hash-temp
@@ -395,7 +393,6 @@ liblyxgraphics_a_SOURCES = \
 noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
-	mathed/CommandInset.cpp \
 	mathed/InsetMathAMSArray.cpp \
 	mathed/InsetMathArray.cpp \
 	mathed/InsetMathBig.cpp \
@@ -409,10 +406,12 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathChar.cpp \
 	mathed/InsetMathClass.cpp \
 	mathed/InsetMathColor.cpp \
+	mathed/InsetMathCommand.cpp \
 	mathed/InsetMathComment.cpp \
 	mathed/InsetMathDecoration.cpp \
 	mathed/InsetMathDecoration.h \
 	mathed/InsetMathDelim.cpp \
+	mathed/InsetMathDiagram.cpp \
 	mathed/InsetMathDiff.cpp \
 	mathed/InsetMathDots.cpp \
 	mathed/InsetMathEnsureMath.cpp \
@@ -427,6 +426,9 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathKern.cpp \
 	mathed/InsetMathLefteqn.cpp \
 	mathed/InsetMathLim.cpp \
+	mathed/InsetMathMacro.cpp \
+	mathed/InsetMathMacroArgument.cpp \
+	mathed/InsetMathMacroTemplate.cpp \
 	mathed/InsetMathMatrix.cpp \
 	mathed/InsetMathNest.cpp \
 	mathed/InsetMathNumber.cpp \
@@ -451,7 +453,6 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathUnknown.cpp \
 	mathed/InsetMathXArrow.cpp \
 	mathed/InsetMathXYMatrix.cpp \
-	mathed/InsetMathDiagram.cpp \
 	mathed/MacroTable.cpp \
 	mathed/MathAtom.cpp \
 	mathed/MathAutoCorrect.cpp \
@@ -459,9 +460,6 @@ SOURCEFILESMATHED = \
 	mathed/MathData.cpp \
 	mathed/MathExtern.cpp \
 	mathed/MathFactory.cpp \
-	mathed/MathMacro.cpp \
-	mathed/MathMacroArgument.cpp \
-	mathed/MathMacroTemplate.cpp \
 	mathed/MathParser.cpp \
 	mathed/MathRow.cpp \
 	mathed/MathStream.cpp \
@@ -469,7 +467,6 @@ SOURCEFILESMATHED = \
 	mathed/TextPainter.cpp
 
 HEADERFILESMATHED = \
-	mathed/CommandInset.h \
 	mathed/InsetMathAMSArray.h \
 	mathed/InsetMathArray.h \
 	mathed/InsetMathBig.h \
@@ -482,6 +479,7 @@ HEADERFILESMATHED = \
 	mathed/InsetMathChar.h \
 	mathed/InsetMathClass.h \
 	mathed/InsetMathColor.h \
+	mathed/InsetMathCommand.h \
 	mathed/InsetMathComment.h \
 	mathed/InsetMathDelim.h \
 	mathed/InsetMathDiff.h \
@@ -499,6 +497,9 @@ HEADERFILESMATHED = \
 	mathed/InsetMathKern.h \
 	mathed/InsetMathLefteqn.h \
 	mathed/InsetMathLim.h \
+	mathed/InsetMathMacro.h \
+	mathed/InsetMathMacroArgument.h \
+	mathed/InsetMathMacroTemplate.h \
 	mathed/InsetMathMatrix.h \
 	mathed/InsetMathNest.h \
 	mathed/InsetMathNumber.h \
@@ -531,10 +532,7 @@ HEADERFILESMATHED = \
 	mathed/MathCompletionList.h \
 	mathed/MathExtern.h \
 	mathed/MathFactory.h \
-	mathed/MathMacro.h \
-	mathed/MathMacroArgument.h \
 	mathed/MacroTable.h \
-	mathed/MathMacroTemplate.h \
 	mathed/MathParser.h \
 	mathed/MathParser_flags.h \
 	mathed/MathRow.h \
@@ -580,7 +578,7 @@ SOURCEFILESINSETS = \
 	insets/InsetCaption.cpp \
 	insets/InsetCaptionable.cpp \
 	insets/InsetCitation.cpp \
-	insets/InsetCollapsable.cpp \
+	insets/InsetCollapsible.cpp \
 	insets/InsetCommand.cpp \
 	insets/InsetCommandParams.cpp \
 	insets/InsetERT.cpp \
@@ -640,7 +638,7 @@ HEADERFILESINSETS = \
 	insets/InsetCaptionable.h \
 	insets/InsetCitation.h \
 	insets/InsetCode.h \
-	insets/InsetCollapsable.h \
+	insets/InsetCollapsible.h \
 	insets/InsetCommand.h \
 	insets/InsetCommandParams.h \
 	insets/InsetERT.h \