X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=1fd0fef6dcadbd4579bfb3b91a50d2ede6b62b8d;hb=e829576bb7a88907e14c25146e2e49093fa83f43;hp=9576076d12322e5bdc6623070ec50ce164525422;hpb=0e50ad8b164724b8e05005c6c5e21d51cd8c8421;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 9576076d12..1fd0fef6dc 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 \
@@ -48,7 +48,8 @@ endif
 if INSTALL_MACOSX
 lyx_LDFLAGS = -framework AppKit -framework ApplicationServices \
 	-Wl,-rpath,@loader_path/../Frameworks \
-	-Wl,-rpath,@executable_path/../Frameworks
+	-Wl,-rpath,@executable_path/../Frameworks \
+	-Wl,-headerpad_max_install_names
 endif
 
 if INSTALL_MACOSX
@@ -134,7 +135,6 @@ SOURCEFILESCORE = \
 	FuncRequest.cpp \
 	FuncStatus.cpp \
 	Graph.cpp \
-	HSpace.cpp \
 	IndicesList.cpp \
 	InsetIterator.cpp \
 	InsetList.cpp \
@@ -237,7 +237,6 @@ HEADERFILESCORE = \
 	FuncRequest.h \
 	FuncStatus.h \
 	Graph.h \
-	HSpace.h \
 	IndicesList.h \
 	InsetIterator.h \
 	InsetList.h \
@@ -307,14 +306,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 +394,6 @@ liblyxgraphics_a_SOURCES = \
 noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
-	mathed/CommandInset.cpp \
 	mathed/InsetMathAMSArray.cpp \
 	mathed/InsetMathArray.cpp \
 	mathed/InsetMathBig.cpp \
@@ -409,10 +407,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 +427,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 +454,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 +461,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 +468,6 @@ SOURCEFILESMATHED = \
 	mathed/TextPainter.cpp
 
 HEADERFILESMATHED = \
-	mathed/CommandInset.h \
 	mathed/InsetMathAMSArray.h \
 	mathed/InsetMathArray.h \
 	mathed/InsetMathBig.h \
@@ -482,6 +480,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 +498,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 +533,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 +579,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 +639,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 \
@@ -705,13 +704,16 @@ endif
 EXTRA_DIST += \
 	tests/test_ExternalTransforms \
 	tests/test_ListingsCaption \
+	tests/test_layout \
+	tests/test_Length \
 	tests/regfiles/ExternalTransforms \
 	tests/regfiles/Length \
 	tests/regfiles/ListingsCaption \
-	tests/test_layout \
-	tests/test_Length
+	tests/dummy_functions.cpp \
+	tests/boost.cpp
 
-TESTS = tests/test_ExternalTransforms tests/test_Length tests/test_ListingsCaption
+TESTS = tests/test_ExternalTransforms tests/test_ListingsCaption \
+	tests/test_layout tests/test_Length
 
 alltests: check alltests-recursive
 
@@ -737,58 +739,63 @@ if INSTALL_MACOSX
 ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
 endif
 
-check_layout_CPPFLAGS = $(AM_CPPFLAGS)
-check_layout_LDADD = support/liblyxsupport.a CiteEnginesList.o $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
+TESTS_LIBS = support/liblyxsupport.a \
+	$(LIBICONV) $(BOOST_LIBS) @LIBS@ \
 	$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
+
+check_layout_CPPFLAGS = $(AM_CPPFLAGS)
+check_layout_LDADD = $(check_layout_LYX_OBJS) $(TESTS_LIBS)
 check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_layout_SOURCES = \
-	insets/InsetLayout.cpp \
-	Color.cpp \
-	Counters.cpp \
-	Floating.cpp \
-	FloatList.cpp \
-	FontInfo.cpp \
-	Layout.cpp \
-	LayoutFile.cpp \
-	Lexer.cpp \
-	ModuleList.cpp \
-	Spacing.cpp \
-	TextClass.cpp \
-	support/tests/dummy_functions.cpp \
 	tests/check_layout.cpp \
+	tests/dummy_functions.cpp \
 	tests/boost.cpp
+check_layout_LYX_OBJS = \
+	insets/InsetLayout.o \
+	CiteEnginesList.o \
+	Color.o \
+	Counters.o \
+	Floating.o \
+	FloatList.o \
+	FontInfo.o \
+	Layout.o \
+	LayoutFile.o \
+	Lexer.o \
+	ModuleList.o \
+	Spacing.o \
+	TextClass.o
 
 check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
-check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
-	$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
+check_ExternalTransforms_LDADD = $(check_ExternalTransforms_LYX_OBJS) $(TESTS_LIBS)
 check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_ExternalTransforms_SOURCES = \
-	graphics/GraphicsParams.cpp \
-	insets/ExternalTransforms.cpp \
-	Length.cpp \
-	lengthcommon.cpp \
-	support/tests/dummy_functions.cpp \
 	tests/check_ExternalTransforms.cpp \
+	tests/dummy_functions.cpp \
 	tests/boost.cpp
+check_ExternalTransforms_LYX_OBJS = \
+	graphics/GraphicsParams.o \
+	insets/ExternalTransforms.o \
+	Length.o \
+	lengthcommon.o
 
 check_Length_CPPFLAGS = $(AM_CPPFLAGS)
-check_Length_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
-	$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
+check_Length_LDADD = $(check_Length_LYX_OBJS) $(TESTS_LIBS)
 check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_Length_SOURCES = \
-	Length.cpp \
-	lengthcommon.cpp \
-	support/tests/dummy_functions.cpp \
 	tests/check_Length.cpp \
+	tests/dummy_functions.cpp \
 	tests/boost.cpp
+check_Length_LYX_OBJS = \
+	Length.o \
+	lengthcommon.o
 
 check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS)
-check_ListingsCaption_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
-	$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
+check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS)
 check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_ListingsCaption_SOURCES = \
-	support/tests/dummy_functions.cpp \
 	tests/check_ListingsCaption.cpp \
+	tests/dummy_functions.cpp \
 	tests/boost.cpp
+check_ListingsCaption_LYX_OBJS =
 
 .PHONY: alltests alltests-recursive updatetests