use AM_CPPFLAGS instead of INCLUDES since that is deprecated

[lyx.git] / src / client / Makefile.am

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 41afc46dc142ae009c313e302757f527c384d468..d6b44b525ddde5a144df08748922d0e12462f0dd 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -6,14 +6,20 @@ man_MANS = lyxclient.1
 
 bin_PROGRAMS = lyxclient
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(PCH_FLAGS)
 
+if USE_INCLUDED_BOOST
+BOOST_LIBS = $(top_builddir)/boost/libs/filesystem/src/libboostfilesystem.la \
+       $(top_builddir)/boost/libs/regex/src/libboostregex.la
+else
+BOOST_LIBS = -lboost_regex -lboost_filesystem
+endif
+
 lyxclient_LDADD = \
        $(top_builddir)/src/support/libsupport.la \
-       $(top_builddir)/boost/libs/filesystem/src/libboostfilesystem.la \
-       $(top_builddir)/boost/libs/regex/src/libboostregex.la
+       $(BOOST_LIBS) $(INTLLIBS)
 
 lyxclient_SOURCES = \
        boost.C \