small changes and two patches from Dekel

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 2bc70a97f7b0f6704359bf243d2140f55d8db61a..4278b992b99fa1b5a4aebb6da598bfe15d230b7a 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -4,7 +4,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 noinst_LTLIBRARIES = libsupport.la
 LIBS =
 ETAGS_ARGS = --lang=c++
-INCLUDES = -I${srcdir}/../
+BOOST_INCLUDES = -I$(top_srcdir)/boost
+INCLUDES = -I${srcdir}/../ $(BOOST_INCLUDES)
 
 EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h
 
@@ -31,8 +32,9 @@ libsupport_la_SOURCES = \
        StrPool.C \
        StrPool.h \
        abort.C \
-       block.h \
+       atoi.C \
        chdir.C \
+       copy.C \
        date.C \
        filetools.C \
        filetools.h \
@@ -50,6 +52,9 @@ libsupport_la_SOURCES = \
        path.C \
        path.h \
        putenv.C \
+       rename.C \
+       rmdir.C \
+       sstream.h \
        $(REGEX) syscall.C \
        syscall.h \
        syscontr.C \
@@ -57,4 +62,4 @@ libsupport_la_SOURCES = \
        syssingleton.C \
        translator.h \
        textutils.h \
-       utility.hpp
+       unlink.C