Fix cppcheck variable scope warnings

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index dccf8d1de083877763b5b49cf5338b2bb030057e..35d890f709392d255e7a6f16607cda848604ba9e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,8 @@ 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 \
@@ -43,7 +44,9 @@ 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
@@ -180,6 +183,7 @@ SOURCEFILESCORE = \
        Session.cpp \
        Spacing.cpp \
        TexRow.cpp \
+       texstream.cpp \
        Text.cpp \
        Text2.cpp \
        Text3.cpp \
@@ -286,6 +290,7 @@ HEADERFILESCORE = \
        Spacing.h \
        SpellChecker.h \
        TexRow.h \
+       texstream.h \
        Text.h \
        TextClass.h \
        TextMetrics.h \
@@ -303,6 +308,25 @@ STANDALONEFILES = \
        Layout.cpp
 
 
+.PHONY: update_commit_hash
+
+LCH_V_GEN = $(lch__v_GEN_@AM_V@)
+lch__v_GEN_ = $(lch__v_GEN_@AM_DEFAULT_V@)
+lch__v_GEN_0 = @echo "  GEN      lyx_commit_hash.h";
+lch__v_GEN_1 =
+
+update_commit_hash:
+       rm -f hash-temp \
+       $(LCH_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 >hash-temp ; \
+       cmp -s lyx_commit_hash.h hash-temp || cp hash-temp lyx_commit_hash.h ; \
+       rm -f hash-temp
+
+lyx_commit_hash.h: update_commit_hash
+
+BUILT_SOURCES += lyx_commit_hash.h
+CLEANFILES += lyx_commit_hash.h
+
 lyxcore.cpp:
        @echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@
 
@@ -321,7 +345,7 @@ endif
 
 #########################  Qt stuff  ##############################
 
-MOCHEADER = Compare.h
+MOCHEADER = Compare.h PreviewLoader.h
 
 if INSTALL_WINDOWS
 
@@ -335,8 +359,11 @@ 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
-       $(QT_MOC) $(MOCFLAG) -o $@ $<
+       $(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $<
 
 liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 
@@ -546,6 +573,7 @@ SOURCEFILESINSETS = \
        insets/InsetBox.cpp \
        insets/InsetBranch.cpp \
        insets/InsetCaption.cpp \
+       insets/InsetCaptionable.cpp \
        insets/InsetCitation.cpp \
        insets/InsetCollapsable.cpp \
        insets/InsetCommand.cpp \
@@ -604,6 +632,7 @@ HEADERFILESINSETS = \
        insets/InsetBox.h \
        insets/InsetBranch.h \
        insets/InsetCaption.h \
+       insets/InsetCaptionable.h \
        insets/InsetCitation.h \
        insets/InsetCode.h \
        insets/InsetCollapsable.h \
@@ -673,7 +702,13 @@ endif
 ############################## Tests ##################################
 
 EXTRA_DIST += \
-       tests/test_layout CMakeLists.txt
+       tests/test_ExternalTransforms \
+       tests/regfiles/ExternalTransforms \
+       tests/regfiles/Length \
+       tests/test_layout \
+       tests/test_Length
+
+TESTS = tests/test_ExternalTransforms tests/test_Length
 
 alltests: check alltests-recursive
 
@@ -690,6 +725,8 @@ updatetests:
        cd tex2lyx; $(MAKE) updatetests
 
 check_PROGRAMS = \
+       check_ExternalTransforms \
+       check_Length \
        check_layout
 
 if INSTALL_MACOSX
@@ -697,8 +734,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@ $(QT_CORE_LIBS) $(LIBSHLWAPI)
-check_layout_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI)
+check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
 check_layout_SOURCES = \
        insets/InsetLayout.cpp \
        Color.cpp \
@@ -716,4 +753,26 @@ check_layout_SOURCES = \
        tests/boost.cpp \
        tests/dummy_functions.cpp
 
+check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
+check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI)
+check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_ExternalTransforms_SOURCES = \
+       graphics/GraphicsParams.cpp \
+       insets/ExternalTransforms.cpp \
+       Length.cpp \
+       lengthcommon.cpp \
+       tests/check_ExternalTransforms.cpp \
+       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
+
 .PHONY: alltests alltests-recursive updatetests