X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=dccf8d1de083877763b5b49cf5338b2bb030057e;hb=11e679f73ecca718c61307973c3d67739354e1c7;hp=e21f8380fca00498507ae1572db5904e202b27dd;hpb=9e53e98b058647f4e16f851871d3f8caf74edeca;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index e21f8380fc..dccf8d1de0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,10 +2,8 @@ include $(top_srcdir)/config/common.am
 
 ############################### Core  ##############################
 
-DISTCLEANFILES += libintl.h
-
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
-AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
+AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = client
@@ -13,10 +11,15 @@ endif
 
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = pch.h
+EXTRA_DIST = pch.h \
+	CMakeLists.txt \
+	graphics/CMakeLists.txt \
+	insets/CMakeLists.txt \
+	mathed/CMakeLists.txt \
+	tests/CMakeLists.txt
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \
-		 $(ENCHANT_LIBS) $(HUNSPELL_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
+            @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
@@ -30,8 +33,8 @@ lyx_LDADD = \
 	liblyxgraphics.a \
 	support/liblyxsupport.a \
 	$(OTHERLIBS) \
-	$(QT4_LDFLAGS) \
-	$(QT4_LIB)
+	$(QT_LDFLAGS) \
+	$(QT_LIB)
 
 if LYX_WIN_RESOURCE
 .rc.o:
@@ -40,7 +43,7 @@ if LYX_WIN_RESOURCE
 endif
 
 if INSTALL_MACOSX
-lyx_LDFLAGS = -framework Carbon -framework Cocoa
+lyx_LDFLAGS = -framework AppKit -framework ApplicationServices
 endif
 
 #lyx_LDFLAGS=-Wl,-O1
@@ -85,6 +88,8 @@ lyx_SOURCES = \
 	$(ENCHANT) \
 	$(HUNSPELL) \
 	$(PWL) \
+	LaTeXFonts.cpp \
+	LaTeXFonts.h \
 	PrinterParams.cpp \
 	PrinterParams.h \
 	Thesaurus.cpp \
@@ -119,6 +124,7 @@ SOURCEFILESCORE = \
 	DepTable.cpp \
 	DocIterator.cpp \
 	Encoding.cpp \
+	BufferEncodings.cpp \
 	ErrorList.cpp \
 	Exporter.cpp \
 	factory.cpp \
@@ -141,6 +147,7 @@ SOURCEFILESCORE = \
 	Language.cpp \
 	LaTeX.cpp \
 	LaTeXFeatures.cpp \
+	LaTeXPackages.cpp \
 	LayoutFile.cpp \
 	LayoutModuleList.cpp \
 	Length.cpp \
@@ -166,7 +173,7 @@ SOURCEFILESCORE = \
 	ParIterator.cpp \
 	PDFOptions.cpp \
 	Row.cpp \
-	rowpainter.cpp \
+	RowPainter.cpp \
 	Server.cpp \
 	ServerSocket.cpp \
 	sgml.cpp \
@@ -176,7 +183,6 @@ SOURCEFILESCORE = \
 	Text.cpp \
 	Text2.cpp \
 	Text3.cpp \
-	TexStream.cpp \
 	TextClass.cpp \
 	TextMetrics.cpp \
 	TocBackend.cpp \
@@ -193,6 +199,7 @@ HEADERFILESCORE = \
 	BranchList.h \
 	buffer_funcs.h \
 	Buffer.h \
+	BufferEncodings.h \
 	BufferList.h \
 	BufferParams.h \
 	BufferView.h \
@@ -215,6 +222,7 @@ HEADERFILESCORE = \
 	DepTable.h \
 	DispatchResult.h \
 	DocIterator.h \
+	DocumentClassPtr.h \
 	Encoding.h \
 	ErrorList.h \
 	Exporter.h \
@@ -239,6 +247,7 @@ HEADERFILESCORE = \
 	KeySequence.h \
 	Language.h \
 	LaTeXFeatures.h \
+	LaTeXPackages.h \
 	LaTeX.h \
 	Layout.h \
 	LayoutEnums.h \
@@ -269,7 +278,7 @@ HEADERFILESCORE = \
 	ParIterator.h \
 	PDFOptions.h \
 	Row.h \
-	rowpainter.h \
+	RowPainter.h \
 	Server.h \
 	ServerSocket.h \
 	Session.h \
@@ -277,7 +286,6 @@ HEADERFILESCORE = \
 	Spacing.h \
 	SpellChecker.h \
 	TexRow.h \
-	TexStream.h \
 	Text.h \
 	TextClass.h \
 	TextMetrics.h \
@@ -328,7 +336,7 @@ BUILT_SOURCES += $(MOCEDFILES)
 CLEANFILES += $(MOCEDFILES)
 
 moc_%.cpp: %.h
-	$(MOC4) $(MOCFLAG) -o $@ $<
+	$(QT_MOC) $(MOCFLAG) -o $@ $<
 
 liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 
@@ -337,6 +345,8 @@ liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 noinst_LIBRARIES += liblyxgraphics.a
 
 liblyxgraphics_a_SOURCES = \
+	graphics/epstools.h \
+	graphics/epstools.cpp \
 	graphics/GraphicsCache.h \
 	graphics/GraphicsCache.cpp \
 	graphics/GraphicsCacheItem.h \
@@ -357,11 +367,10 @@ liblyxgraphics_a_SOURCES = \
 
 ############################### Mathed  ##############################
 
-EXTRA_DIST += mathed/InsetFormulaMacro.cpp
-
 noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
+	mathed/CommandInset.cpp \
 	mathed/InsetMathAMSArray.cpp \
 	mathed/InsetMathArray.cpp \
 	mathed/InsetMathBig.cpp \
@@ -372,7 +381,6 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathCases.cpp \
 	mathed/InsetMathChar.cpp \
 	mathed/InsetMathColor.cpp \
-	mathed/CommandInset.cpp \
 	mathed/InsetMathComment.cpp \
 	mathed/InsetMathDecoration.cpp \
 	mathed/InsetMathDecoration.h \
@@ -391,7 +399,8 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathKern.cpp \
 	mathed/InsetMathLefteqn.cpp \
 	mathed/InsetMathLim.cpp \
-	mathed/MathMacro.cpp \
+	mathed/InsetMathCancel.cpp \
+	mathed/InsetMathCancelto.cpp \
 	mathed/InsetMathMatrix.cpp \
 	mathed/InsetMathNest.cpp \
 	mathed/InsetMathNumber.cpp \
@@ -401,6 +410,7 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathRef.cpp \
 	mathed/InsetMathRoot.cpp \
 	mathed/InsetMathScript.cpp \
+	mathed/InsetMathSideset.cpp \
 	mathed/InsetMathSize.cpp \
 	mathed/InsetMathSpace.cpp \
 	mathed/InsetMathSpecialChar.cpp \
@@ -421,6 +431,7 @@ SOURCEFILESMATHED = \
 	mathed/MathData.cpp \
 	mathed/MathExtern.cpp \
 	mathed/MathFactory.cpp \
+	mathed/MathMacro.cpp \
 	mathed/MathMacroArgument.cpp \
 	mathed/MacroTable.cpp \
 	mathed/MathMacroTemplate.cpp \
@@ -430,16 +441,18 @@ SOURCEFILESMATHED = \
 	mathed/TextPainter.cpp
 
 HEADERFILESMATHED = \
+	mathed/CommandInset.h \
 	mathed/InsetMathAMSArray.h \
 	mathed/InsetMathArray.h \
 	mathed/InsetMathBig.h \
 	mathed/InsetMathBoldSymbol.h \
 	mathed/InsetMathBox.h \
 	mathed/InsetMathBrace.h \
+	mathed/InsetMathCancel.h \
+	mathed/InsetMathCancelto.h \
 	mathed/InsetMathCases.h \
 	mathed/InsetMathChar.h \
 	mathed/InsetMathColor.h \
-	mathed/CommandInset.h \
 	mathed/InsetMathComment.h \
 	mathed/InsetMathDelim.h \
 	mathed/InsetMathDiff.h \
@@ -457,7 +470,6 @@ HEADERFILESMATHED = \
 	mathed/InsetMathKern.h \
 	mathed/InsetMathLefteqn.h \
 	mathed/InsetMathLim.h \
-	mathed/MathMacro.h \
 	mathed/InsetMathMatrix.h \
 	mathed/InsetMathNest.h \
 	mathed/InsetMathNumber.h \
@@ -467,6 +479,7 @@ HEADERFILESMATHED = \
 	mathed/InsetMathRef.h \
 	mathed/InsetMathRoot.h \
 	mathed/InsetMathScript.h \
+	mathed/InsetMathSideset.h \
 	mathed/InsetMathSize.h \
 	mathed/InsetMathSpace.h \
 	mathed/InsetMathSpecialChar.h \
@@ -488,7 +501,7 @@ HEADERFILESMATHED = \
 	mathed/MathCompletionList.h \
 	mathed/MathExtern.h \
 	mathed/MathFactory.h \
-	mathed/MathGridInfo.h \
+	mathed/MathMacro.h \
 	mathed/MathMacroArgument.h \
 	mathed/MacroTable.h \
 	mathed/MathMacroTemplate.h \
@@ -550,6 +563,8 @@ SOURCEFILESINSETS = \
 	insets/InsetInclude.cpp \
 	insets/InsetIndex.cpp \
 	insets/InsetInfo.cpp \
+	insets/InsetIPA.cpp \
+	insets/InsetIPAMacro.cpp \
 	insets/InsetLabel.cpp \
 	insets/InsetLayout.cpp \
 	insets/InsetLine.cpp \
@@ -565,6 +580,7 @@ SOURCEFILESINSETS = \
 	insets/InsetQuotes.cpp \
 	insets/InsetRef.cpp \
 	insets/InsetScript.cpp \
+	insets/InsetSeparator.cpp \
 	insets/InsetSpace.cpp \
 	insets/InsetSpecialChar.cpp \
 	insets/InsetTabular.cpp \
@@ -606,6 +622,8 @@ HEADERFILESINSETS = \
 	insets/InsetInclude.h \
 	insets/InsetIndex.h \
 	insets/InsetInfo.h \
+	insets/InsetIPA.h \
+	insets/InsetIPAMacro.h \
 	insets/InsetPreview.h \
 	insets/InsetLabel.h \
 	insets/InsetLayout.h \
@@ -621,6 +639,7 @@ HEADERFILESINSETS = \
 	insets/InsetQuotes.h \
 	insets/InsetRef.h \
 	insets/InsetScript.h \
+	insets/InsetSeparator.h \
 	insets/InsetSpace.h \
 	insets/InsetSpecialChar.h \
 	insets/InsetTabular.h \
@@ -649,3 +668,52 @@ else
 liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
 endif
+
+
+############################## Tests ##################################
+
+EXTRA_DIST += \
+	tests/test_layout CMakeLists.txt
+
+alltests: check alltests-recursive
+
+alltests-recursive: check_layout
+	@srcdir=$(srcdir) $(srcdir)/tests/test_layout; \
+	if test $$? -eq 0; then \
+		echo -e "====================\nlayout tests passed.\n===================="; \
+	else \
+		echo -e "====================\nlayout tests failed.\n===================="; \
+	fi
+	cd tex2lyx; $(MAKE) alltests-recursive
+
+updatetests:
+	cd tex2lyx; $(MAKE) updatetests
+
+check_PROGRAMS = \
+	check_layout
+
+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 $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_CORE_LIBS) $(LIBSHLWAPI)
+check_layout_LDFLAGS = $(QT_CORE_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 \
+	tests/check_layout.cpp \
+	tests/boost.cpp \
+	tests/dummy_functions.cpp
+
+.PHONY: alltests alltests-recursive updatetests