X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=125f1dbf2bdf420a80fdce87d0124a459cfca0fe;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=780b7102ff021bee77f33d4cfecf2a11cb797fae;hpb=b79c88034edaa6cc256c8869820b5d8f943d3bbf;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index 780b7102ff..125f1dbf2b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,8 +2,6 @@ include $(top_srcdir)/config/common.am ############################### Core ############################## -DISTCLEANFILES += libintl.h - AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) @@ -15,8 +13,8 @@ SUBDIRS = support frontends . $(CLIENT) tex2lyx EXTRA_DIST = pch.h -OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \ - $(ENCHANT_LIBS) $(HUNSPELL_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI) +OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \ + @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI) noinst_LIBRARIES = liblyxcore.a bin_PROGRAMS = lyx @@ -364,8 +362,6 @@ liblyxgraphics_a_SOURCES = \ ############################### Mathed ############################## -EXTRA_DIST += mathed/InsetFormulaMacro.cpp - noinst_LIBRARIES += liblyxmathed.a SOURCEFILESMATHED = \ @@ -500,7 +496,6 @@ HEADERFILESMATHED = \ mathed/MathCompletionList.h \ mathed/MathExtern.h \ mathed/MathFactory.h \ - mathed/MathGridInfo.h \ mathed/MathMacro.h \ mathed/MathMacroArgument.h \ mathed/MacroTable.h \ @@ -671,20 +666,20 @@ endif ############################## Tests ################################## EXTRA_DIST += \ - tests/test_Layout + tests/test_layout TESTS = \ - tests/test_Layout + tests/test_layout check_PROGRAMS = \ - check_Layout + check_layout -check_Layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS -check_Layout_LDADD = support/liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI) +check_layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS +check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI) # need to allow multiple definitions of _() (see dummy_functions.cpp) -check_Layout_LDFLAGS = $(QT4_CORE_LDFLAGS) -Wl,--allow-multiple-definition -check_Layout_SOURCES = \ +check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) -Wl,--allow-multiple-definition +check_layout_SOURCES = \ insets/InsetLayout.cpp \ Color.cpp \ Counters.cpp \ @@ -697,7 +692,7 @@ check_Layout_SOURCES = \ ModuleList.cpp \ Spacing.cpp \ TextClass.cpp \ - tests/check_Layout.cpp \ + tests/check_layout.cpp \ support/tests/boost.cpp \ support/tests/dummy_functions.cpp