\\subfloat captions are moving arguments

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 024cf45661c6e49dbdf4bac43945de28db9d49bf..373c0b074ca47044e1252adb6aee211a22932e60 100644 (file)
--- 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,13 @@ endif
 
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = pch.h
+EXTRA_DIST = lyx_commit_hash.h.in \
+       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 +34,8 @@ lyx_LDADD = \
        liblyxgraphics.a \
        support/liblyxsupport.a \
        $(OTHERLIBS) \
-       $(QT4_LDFLAGS) \
-       $(QT4_LIB)
+       $(QT_LDFLAGS) \
+       $(QT_LIB)
 
 if LYX_WIN_RESOURCE
 .rc.o:
@@ -119,6 +125,7 @@ SOURCEFILESCORE = \
        DepTable.cpp \
        DocIterator.cpp \
        Encoding.cpp \
+       BufferEncodings.cpp \
        ErrorList.cpp \
        Exporter.cpp \
        factory.cpp \
@@ -167,7 +174,7 @@ SOURCEFILESCORE = \
        ParIterator.cpp \
        PDFOptions.cpp \
        Row.cpp \
-       rowpainter.cpp \
+       RowPainter.cpp \
        Server.cpp \
        ServerSocket.cpp \
        sgml.cpp \
@@ -177,7 +184,6 @@ SOURCEFILESCORE = \
        Text.cpp \
        Text2.cpp \
        Text3.cpp \
-       TexStream.cpp \
        TextClass.cpp \
        TextMetrics.cpp \
        TocBackend.cpp \
@@ -194,6 +200,7 @@ HEADERFILESCORE = \
        BranchList.h \
        buffer_funcs.h \
        Buffer.h \
+       BufferEncodings.h \
        BufferList.h \
        BufferParams.h \
        BufferView.h \
@@ -272,7 +279,7 @@ HEADERFILESCORE = \
        ParIterator.h \
        PDFOptions.h \
        Row.h \
-       rowpainter.h \
+       RowPainter.h \
        Server.h \
        ServerSocket.h \
        Session.h \
@@ -280,7 +287,6 @@ HEADERFILESCORE = \
        Spacing.h \
        SpellChecker.h \
        TexRow.h \
-       TexStream.h \
        Text.h \
        TextClass.h \
        TextMetrics.h \
@@ -297,6 +303,13 @@ HEADERFILESCORE = \
 STANDALONEFILES = \
        Layout.cpp
 
+.PHONY: lyx_commit_hash.h
+
+lyx_commit_hash.h:
+       $(AM_V_GEN)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 >$@
+BUILT_SOURCES += lyx_commit_hash.h
+CLEANFILES += lyx_commit_hash.h
 
 lyxcore.cpp:
        @echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@
@@ -331,7 +344,7 @@ BUILT_SOURCES += $(MOCEDFILES)
 CLEANFILES += $(MOCEDFILES)
 
 moc_%.cpp: %.h
-       $(MOC4) $(MOCFLAG) -o $@ $<
+       $(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $<
 
 liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 
@@ -575,6 +588,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 +647,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 +681,7 @@ endif
 ############################## Tests ##################################
 
 EXTRA_DIST += \
-       tests/test_layout
+       tests/test_layout CMakeLists.txt
 
 alltests: check alltests-recursive
 
@@ -689,9 +704,9 @@ if INSTALL_MACOSX
 ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
 endif
 
-check_layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS
-check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI)
-check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+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 \
@@ -706,7 +721,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