X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=047188f848df3a5c45393dcf38d58be622820a8c;hb=5a8e91d1c5381d8c152b12269707b547d5241624;hp=81f8ec762550ad6b5f911dff8015383fb4f2092c;hpb=1db9224cfff615f3ec90245fed1ce018811f7e5d;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 81f8ec7625..047188f848 100644
--- 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 \
@@ -181,6 +179,7 @@ SOURCEFILESCORE = \
 	Session.cpp \
 	Spacing.cpp \
 	TexRow.cpp \
+	texstream.cpp \
 	Text.cpp \
 	Text2.cpp \
 	Text3.cpp \
@@ -196,7 +195,6 @@ SOURCEFILESCORE = \
 
 HEADERFILESCORE = \
 	Author.h \
-	Bidi.h \
 	BranchList.h \
 	buffer_funcs.h \
 	Buffer.h \
@@ -287,6 +285,7 @@ HEADERFILESCORE = \
 	Spacing.h \
 	SpellChecker.h \
 	TexRow.h \
+	texstream.h \
 	Text.h \
 	TextClass.h \
 	TextMetrics.h \
@@ -303,16 +302,28 @@ 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
+.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' > $@
+	$(AM_V_GEN)for file in $(SOURCEFILESCORE) ; do echo '#include "'$${file}'"' ; done >$@
 
 if MONOLITHIC_CORE
 
@@ -329,7 +340,7 @@ endif
 
 #########################  Qt stuff  ##############################
 
-MOCHEADER = Compare.h
+MOCHEADER = Compare.h PreviewLoader.h
 
 if INSTALL_WINDOWS
 
@@ -343,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 $@ $<
 
@@ -521,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
 
@@ -554,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 \
@@ -612,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 \
@@ -662,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
 
@@ -682,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
 
@@ -703,6 +723,8 @@ updatetests:
 
 check_PROGRAMS = \
 	check_ExternalTransforms \
+	check_Length \
+	check_ListingsCaption \
 	check_layout
 
 if INSTALL_MACOSX
@@ -710,8 +732,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 \
@@ -730,8 +752,8 @@ check_layout_SOURCES = \
 	tests/dummy_functions.cpp
 
 check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
-check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_CORE_LIBS) $(LIBSHLWAPI)
-check_ExternalTransforms_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
+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 \
@@ -741,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