Recompute Paragraph::beginOfBody() earlier

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cf255568276173ce1ff39b1883258403312974c2..047188f848df3a5c45393dcf38d58be622820a8c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 ############################### Core  ##############################
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
+AM_CPPFLAGS += -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
 AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -12,7 +12,6 @@ endif
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
 EXTRA_DIST = lyx_commit_hash.h.in \
-       pch.h \
        CMakeLists.txt \
        graphics/CMakeLists.txt \
        insets/CMakeLists.txt \
@@ -51,8 +50,6 @@ endif
 
 #lyx_LDFLAGS=-Wl,-O1
 
-BUILT_SOURCES = $(PCH_FILE)
-
 if INSTALL_MACOSX
 APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h
 endif
@@ -104,7 +101,6 @@ endif
 
 SOURCEFILESCORE = \
        Author.cpp \
-       Bidi.cpp \
        boost.cpp \
        BranchList.cpp \
        Buffer.cpp \
@@ -199,7 +195,6 @@ SOURCEFILESCORE = \
 
 HEADERFILESCORE = \
        Author.h \
-       Bidi.h \
        BranchList.h \
        buffer_funcs.h \
        Buffer.h \
@@ -324,11 +319,11 @@ update_commit_hash:
 
 lyx_commit_hash.h: update_commit_hash
 
-BUILT_SOURCES += lyx_commit_hash.h
-CLEANFILES += lyx_commit_hash.h
+BUILT_SOURCES = lyx_commit_hash.h
+CLEANFILES = lyx_commit_hash.h
 
 lyxcore.cpp:
-       @echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@
+       $(AM_V_GEN)for file in $(SOURCEFILESCORE) ; do echo '#include "'$${file}'"' ; done >$@
 
 if MONOLITHIC_CORE
 
@@ -540,7 +535,7 @@ HEADERFILESMATHED = \
        mathed/TextPainter.h
 
 lyxmathed.cpp:
-       @echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
+       $(AM_V_GEN)for file in $(SOURCEFILESMATHED) ; do echo '#include "'$${file}'"' ; done >$@
 
 if MONOLITHIC_MATHED
 
@@ -573,6 +568,7 @@ SOURCEFILESINSETS = \
        insets/InsetBox.cpp \
        insets/InsetBranch.cpp \
        insets/InsetCaption.cpp \
+       insets/InsetCaptionable.cpp \
        insets/InsetCitation.cpp \
        insets/InsetCollapsable.cpp \
        insets/InsetCommand.cpp \
@@ -631,6 +627,7 @@ HEADERFILESINSETS = \
        insets/InsetBox.h \
        insets/InsetBranch.h \
        insets/InsetCaption.h \
+       insets/InsetCaptionable.h \
        insets/InsetCitation.h \
        insets/InsetCode.h \
        insets/InsetCollapsable.h \
@@ -681,7 +678,7 @@ HEADERFILESINSETS = \
 #      insets/InsetSection.cpp
 
 lyxinsets.cpp:
-       @echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@
+       $(AM_V_GEN)for file in $(SOURCEFILESINSETS) ; do echo '#include "'$${file}'"' ; done >$@
 
 if MONOLITHIC_INSETS
 
@@ -701,12 +698,14 @@ endif
 
 EXTRA_DIST += \
        tests/test_ExternalTransforms \
+       tests/test_ListingsCaption \
        tests/regfiles/ExternalTransforms \
        tests/regfiles/Length \
+       tests/regfiles/ListingsCaption \
        tests/test_layout \
        tests/test_Length
 
-TESTS = tests/test_ExternalTransforms tests/test_Length
+TESTS = tests/test_ExternalTransforms tests/test_Length tests/test_ListingsCaption
 
 alltests: check alltests-recursive
 
@@ -725,6 +724,7 @@ updatetests:
 check_PROGRAMS = \
        check_ExternalTransforms \
        check_Length \
+       check_ListingsCaption \
        check_layout
 
 if INSTALL_MACOSX
@@ -773,4 +773,12 @@ check_Length_SOURCES = \
        tests/boost.cpp \
        tests/dummy_functions.cpp
 
+check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS)
+check_ListingsCaption_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI)
+check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_ListingsCaption_SOURCES = \
+       tests/check_ListingsCaption.cpp \
+       tests/boost.cpp \
+       tests/dummy_functions.cpp
+
 .PHONY: alltests alltests-recursive updatetests