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

diff --git a/src/Makefile.am b/src/Makefile.am
index 761c8e4291..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:
@@ -121,6 +124,7 @@ SOURCEFILESCORE = \
 	DepTable.cpp \
 	DocIterator.cpp \
 	Encoding.cpp \
+	BufferEncodings.cpp \
 	ErrorList.cpp \
 	Exporter.cpp \
 	factory.cpp \
@@ -169,7 +173,7 @@ SOURCEFILESCORE = \
 	ParIterator.cpp \
 	PDFOptions.cpp \
 	Row.cpp \
-	rowpainter.cpp \
+	RowPainter.cpp \
 	Server.cpp \
 	ServerSocket.cpp \
 	sgml.cpp \
@@ -179,7 +183,6 @@ SOURCEFILESCORE = \
 	Text.cpp \
 	Text2.cpp \
 	Text3.cpp \
-	TexStream.cpp \
 	TextClass.cpp \
 	TextMetrics.cpp \
 	TocBackend.cpp \
@@ -196,6 +199,7 @@ HEADERFILESCORE = \
 	BranchList.h \
 	buffer_funcs.h \
 	Buffer.h \
+	BufferEncodings.h \
 	BufferList.h \
 	BufferParams.h \
 	BufferView.h \
@@ -274,7 +278,7 @@ HEADERFILESCORE = \
 	ParIterator.h \
 	PDFOptions.h \
 	Row.h \
-	rowpainter.h \
+	RowPainter.h \
 	Server.h \
 	ServerSocket.h \
 	Session.h \
@@ -282,7 +286,6 @@ HEADERFILESCORE = \
 	Spacing.h \
 	SpellChecker.h \
 	TexRow.h \
-	TexStream.h \
 	Text.h \
 	TextClass.h \
 	TextMetrics.h \
@@ -333,7 +336,7 @@ BUILT_SOURCES += $(MOCEDFILES)
 CLEANFILES += $(MOCEDFILES)
 
 moc_%.cpp: %.h
-	$(MOC4) $(MOCFLAG) -o $@ $<
+	$(QT_MOC) $(MOCFLAG) -o $@ $<
 
 liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 
@@ -364,8 +367,6 @@ liblyxgraphics_a_SOURCES = \
 
 ############################### Mathed  ##############################
 
-EXTRA_DIST += mathed/InsetFormulaMacro.cpp
-
 noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
@@ -500,7 +501,6 @@ HEADERFILESMATHED = \
 	mathed/MathCompletionList.h \
 	mathed/MathExtern.h \
 	mathed/MathFactory.h \
-	mathed/MathGridInfo.h \
 	mathed/MathMacro.h \
 	mathed/MathMacroArgument.h \
 	mathed/MacroTable.h \
@@ -580,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 \
@@ -638,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 \
@@ -671,19 +673,32 @@ endif
 ############################## Tests ##################################
 
 EXTRA_DIST += \
-	tests/test_layout
+	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
 
-TESTS = \
-	tests/test_layout
+updatetests:
+	cd tex2lyx; $(MAKE) updatetests
 
 check_PROGRAMS = \
 	check_layout
 
-check_layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS
-check_layout_LDADD = support/liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI)
-# need to allow multiple definitions of _() (see dummy_functions.cpp)
-check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) -Wl,--allow-multiple-definition
+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 \
@@ -698,6 +713,7 @@ check_layout_SOURCES = \
 	Spacing.cpp \
 	TextClass.cpp \
 	tests/check_layout.cpp \
-	support/tests/boost.cpp \
-	support/tests/dummy_functions.cpp
+	tests/boost.cpp \
+	tests/dummy_functions.cpp
 
+.PHONY: alltests alltests-recursive updatetests