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

diff --git a/src/Makefile.am b/src/Makefile.am
index d3ea7bc0e4..dccf8d1de0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/config/common.am
 ############################### Core  ##############################
 
 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
@@ -11,7 +11,12 @@ 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) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
             @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
@@ -28,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:
@@ -168,7 +173,7 @@ SOURCEFILESCORE = \
 	ParIterator.cpp \
 	PDFOptions.cpp \
 	Row.cpp \
-	rowpainter.cpp \
+	RowPainter.cpp \
 	Server.cpp \
 	ServerSocket.cpp \
 	sgml.cpp \
@@ -273,7 +278,7 @@ HEADERFILESCORE = \
 	ParIterator.h \
 	PDFOptions.h \
 	Row.h \
-	rowpainter.h \
+	RowPainter.h \
 	Server.h \
 	ServerSocket.h \
 	Session.h \
@@ -331,7 +336,7 @@ BUILT_SOURCES += $(MOCEDFILES)
 CLEANFILES += $(MOCEDFILES)
 
 moc_%.cpp: %.h
-	$(MOC4) $(MOCFLAG) -o $@ $<
+	$(QT_MOC) $(MOCFLAG) -o $@ $<
 
 liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 
@@ -575,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 \
@@ -633,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 \
@@ -666,7 +673,7 @@ endif
 ############################## Tests ##################################
 
 EXTRA_DIST += \
-	tests/test_layout
+	tests/test_layout CMakeLists.txt
 
 alltests: check alltests-recursive
 
@@ -690,8 +697,8 @@ ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework
 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_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 \