X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=9b6b5384c69e110bf1ad2441b095db498efa7c2d;hb=d4428ceb81d12dde60102ad0bb3d1503efc54eda;hp=e40a3bc278aabc17fe9898c2e6fad8803e382d2b;hpb=4bdeae27334536164cb7e37da9a9e491075fd682;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index e40a3bc278..9b6b5384c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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)
@@ -168,13 +174,14 @@ SOURCEFILESCORE = \
 	ParIterator.cpp \
 	PDFOptions.cpp \
 	Row.cpp \
-	rowpainter.cpp \
+	RowPainter.cpp \
 	Server.cpp \
 	ServerSocket.cpp \
 	sgml.cpp \
 	Session.cpp \
 	Spacing.cpp \
 	TexRow.cpp \
+	texstream.cpp \
 	Text.cpp \
 	Text2.cpp \
 	Text3.cpp \
@@ -273,7 +280,7 @@ HEADERFILESCORE = \
 	ParIterator.h \
 	PDFOptions.h \
 	Row.h \
-	rowpainter.h \
+	RowPainter.h \
 	Server.h \
 	ServerSocket.h \
 	Session.h \
@@ -281,6 +288,7 @@ HEADERFILESCORE = \
 	Spacing.h \
 	SpellChecker.h \
 	TexRow.h \
+	texstream.h \
 	Text.h \
 	TextClass.h \
 	TextMetrics.h \
@@ -297,6 +305,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 +346,7 @@ BUILT_SOURCES += $(MOCEDFILES)
 CLEANFILES += $(MOCEDFILES)
 
 moc_%.cpp: %.h
-	$(QT_MOC) $(MOCFLAG) -o $@ $<
+	$(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $<
 
 liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 
@@ -668,8 +683,12 @@ endif
 ############################## Tests ##################################
 
 EXTRA_DIST += \
+	tests/test_ExternalTransforms \
+	tests/regfiles/ExternalTransforms \
 	tests/test_layout
 
+TESTS = tests/test_ExternalTransforms
+
 alltests: check alltests-recursive
 
 alltests-recursive: check_layout
@@ -685,6 +704,7 @@ updatetests:
 	cd tex2lyx; $(MAKE) updatetests
 
 check_PROGRAMS = \
+	check_ExternalTransforms \
 	check_layout
 
 if INSTALL_MACOSX
@@ -711,4 +731,16 @@ 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_CORE_LIBS) $(LIBSHLWAPI)
+check_ExternalTransforms_LDFLAGS = $(QT_CORE_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
+
 .PHONY: alltests alltests-recursive updatetests