InsetBox.cpp: fix bug #8712

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9b863cdf129e4f09ed1e3141d5e800ca98d64b64..9446d17be269d5a3025d5737021f9c0a7ff744c5 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 \
@@ -44,13 +43,13 @@ if LYX_WIN_RESOURCE
 endif
 
 if INSTALL_MACOSX
-lyx_LDFLAGS = -framework AppKit -framework ApplicationServices
+lyx_LDFLAGS = -framework AppKit -framework ApplicationServices \
+       -Wl,-rpath,@loader_path/../Frameworks \
+       -Wl,-rpath,@executable_path/../Frameworks
 endif
 
 #lyx_LDFLAGS=-Wl,-O1
 
-BUILT_SOURCES = $(PCH_FILE)
-
 if INSTALL_MACOSX
 APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h
 endif
@@ -102,7 +101,6 @@ endif
 
 SOURCEFILESCORE = \
        Author.cpp \
-       Bidi.cpp \
        boost.cpp \
        BranchList.cpp \
        Buffer.cpp \
@@ -197,7 +195,6 @@ SOURCEFILESCORE = \
 
 HEADERFILESCORE = \
        Author.h \
-       Bidi.h \
        BranchList.h \
        buffer_funcs.h \
        Buffer.h \
@@ -322,8 +319,8 @@ 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' > $@
@@ -343,7 +340,7 @@ endif
 
 #########################  Qt stuff  ##############################
 
-MOCHEADER = Compare.h
+MOCHEADER = Compare.h PreviewLoader.h
 
 if INSTALL_WINDOWS
 
@@ -357,6 +354,9 @@ MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 BUILT_SOURCES += $(MOCEDFILES)
 CLEANFILES += $(MOCEDFILES)
 
+moc_PreviewLoader.cpp: graphics/PreviewLoader.h
+       $(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $<
+
 moc_%.cpp: %.h
        $(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $<
 
@@ -568,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 \
@@ -626,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 \
@@ -696,10 +698,14 @@ endif
 
 EXTRA_DIST += \
        tests/test_ExternalTransforms \
+       tests/test_ListingsCaption \
        tests/regfiles/ExternalTransforms \
-       tests/test_layout
+       tests/regfiles/Length \
+       tests/regfiles/ListingsCaption \
+       tests/test_layout \
+       tests/test_Length
 
-TESTS = tests/test_ExternalTransforms
+TESTS = tests/test_ExternalTransforms tests/test_Length tests/test_ListingsCaption
 
 alltests: check alltests-recursive
 
@@ -717,6 +723,8 @@ updatetests:
 
 check_PROGRAMS = \
        check_ExternalTransforms \
+       check_Length \
+       check_ListingsCaption \
        check_layout
 
 if INSTALL_MACOSX
@@ -755,4 +763,22 @@ check_ExternalTransforms_SOURCES = \
        tests/boost.cpp \
        tests/dummy_functions.cpp
 
+check_Length_CPPFLAGS = $(AM_CPPFLAGS)
+check_Length_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI)
+check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_Length_SOURCES = \
+       Length.cpp \
+       lengthcommon.cpp \
+       tests/check_Length.cpp \
+       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