tex2lyx: honor grouping in optional arguments.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9bc6b197708506a46baf1b9ea0e6070bc020dd78..28592fb0a2651057745c3d78dc5f13de2c3b20d4 100644 (file)
--- 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 \
@@ -305,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
@@ -411,6 +411,7 @@ SOURCEFILESMATHED = \
        mathed/InsetMathDecoration.cpp \
        mathed/InsetMathDecoration.h \
        mathed/InsetMathDelim.cpp \
+       mathed/InsetMathDiagram.cpp \
        mathed/InsetMathDiff.cpp \
        mathed/InsetMathDots.cpp \
        mathed/InsetMathEnsureMath.cpp \
@@ -452,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 \
@@ -578,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 \
@@ -638,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 \