X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=125f1dbf2bdf420a80fdce87d0124a459cfca0fe;hb=26910d5ec49395d1372dd5b9259f1bf6ed23de0a;hp=b40d4e04d6ae77be557312d216439d8aae5ca9f4;hpb=f75becdc4e8f02085212e6d2b016c76dc76c5980;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index b40d4e04d6..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 @@ -678,7 +676,7 @@ check_PROGRAMS = \ 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_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 = \