X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=ea5ca423406d6cb08a036ea221f34ec6577edbce;hb=d4ac337f0bd89c279b2133e2475a662a3ada641b;hp=02a878d56f9825cab33fb26aeb8f2ebef38b681e;hpb=ead697d4b6c7122a2144b96712e6d2a3184f6fd8;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 02a878d56f..ea5ca42340 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,6 @@ 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)
 
@@ -15,8 +13,8 @@ SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
 EXTRA_DIST = pch.h
 
-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
@@ -40,7 +38,7 @@ if LYX_WIN_RESOURCE
 endif
 
 if INSTALL_MACOSX
-lyx_LDFLAGS = -framework AppKit
+lyx_LDFLAGS = -framework AppKit -framework ApplicationServices
 endif
 
 #lyx_LDFLAGS=-Wl,-O1
@@ -85,6 +83,8 @@ lyx_SOURCES = \
 	$(ENCHANT) \
 	$(HUNSPELL) \
 	$(PWL) \
+	LaTeXFonts.cpp \
+	LaTeXFonts.h \
 	PrinterParams.cpp \
 	PrinterParams.h \
 	Thesaurus.cpp \
@@ -119,6 +119,7 @@ SOURCEFILESCORE = \
 	DepTable.cpp \
 	DocIterator.cpp \
 	Encoding.cpp \
+	BufferEncodings.cpp \
 	ErrorList.cpp \
 	Exporter.cpp \
 	factory.cpp \
@@ -194,6 +195,7 @@ HEADERFILESCORE = \
 	BranchList.h \
 	buffer_funcs.h \
 	Buffer.h \
+	BufferEncodings.h \
 	BufferList.h \
 	BufferParams.h \
 	BufferView.h \
@@ -362,8 +364,6 @@ liblyxgraphics_a_SOURCES = \
 
 ############################### Mathed  ##############################
 
-EXTRA_DIST += mathed/InsetFormulaMacro.cpp
-
 noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
@@ -407,6 +407,7 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathRef.cpp \
 	mathed/InsetMathRoot.cpp \
 	mathed/InsetMathScript.cpp \
+	mathed/InsetMathSideset.cpp \
 	mathed/InsetMathSize.cpp \
 	mathed/InsetMathSpace.cpp \
 	mathed/InsetMathSpecialChar.cpp \
@@ -475,6 +476,7 @@ HEADERFILESMATHED = \
 	mathed/InsetMathRef.h \
 	mathed/InsetMathRoot.h \
 	mathed/InsetMathScript.h \
+	mathed/InsetMathSideset.h \
 	mathed/InsetMathSize.h \
 	mathed/InsetMathSpace.h \
 	mathed/InsetMathSpecialChar.h \
@@ -496,7 +498,6 @@ HEADERFILESMATHED = \
 	mathed/MathCompletionList.h \
 	mathed/MathExtern.h \
 	mathed/MathFactory.h \
-	mathed/MathGridInfo.h \
 	mathed/MathMacro.h \
 	mathed/MathMacroArgument.h \
 	mathed/MacroTable.h \
@@ -560,6 +561,7 @@ SOURCEFILESINSETS = \
 	insets/InsetIndex.cpp \
 	insets/InsetInfo.cpp \
 	insets/InsetIPA.cpp \
+	insets/InsetIPAMacro.cpp \
 	insets/InsetLabel.cpp \
 	insets/InsetLayout.cpp \
 	insets/InsetLine.cpp \
@@ -617,6 +619,7 @@ HEADERFILESINSETS = \
 	insets/InsetIndex.h \
 	insets/InsetInfo.h \
 	insets/InsetIPA.h \
+	insets/InsetIPAMacro.h \
 	insets/InsetPreview.h \
 	insets/InsetLabel.h \
 	insets/InsetLayout.h \
@@ -660,3 +663,52 @@ else
 liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
 endif
+
+
+############################## Tests ##################################
+
+EXTRA_DIST += \
+	tests/test_layout
+
+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@ $(QT4_CORE_LIBS) $(LIBSHLWAPI)
+check_layout_LDFLAGS = $(QT4_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 \
+	support/tests/boost.cpp \
+	support/tests/dummy_functions.cpp
+
+.PHONY: alltests alltests-recursive updatetests