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 570077fbf1607f6e37c273c17379e1dc0ec0121b..4278b992b99fa1b5a4aebb6da598bfe15d230b7a 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,8 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
+DISTCLEANFILES= *.orig *.rej *~ *.bak core
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 noinst_LTLIBRARIES = libsupport.la
 LIBS =
-ETAGS_ARGS = --c++
-INCLUDES = -I${srcdir}/../
+ETAGS_ARGS = --lang=c++
+BOOST_INCLUDES = -I$(top_srcdir)/boost
+INCLUDES = -I${srcdir}/../ $(BOOST_INCLUDES)
 
 EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h
 
@@ -18,6 +21,7 @@ libsupport_la_SOURCES = \
        DebugStream.h \
        FileInfo.C \
        FileInfo.h \
+       LAssert.C \
        LAssert.h \
        LIstream.h \
        LOstream.h \
@@ -25,9 +29,12 @@ libsupport_la_SOURCES = \
        LRegex.h \
        LSubstring.C \
        LSubstring.h \
+       StrPool.C \
+       StrPool.h \
        abort.C \
-       block.h \
+       atoi.C \
        chdir.C \
+       copy.C \
        date.C \
        filetools.C \
        filetools.h \
@@ -36,16 +43,23 @@ libsupport_la_SOURCES = \
        kill.C \
        lstrings.C \
        lstrings.h \
+       lxtl.h \
        lyxalgo.h \
        lyxlib.h \
        lyxmanip.h \
        $(LYXSTRING) lyxsum.C \
        mkdir.C \
+       path.C \
        path.h \
        putenv.C \
+       rename.C \
+       rmdir.C \
+       sstream.h \
        $(REGEX) syscall.C \
        syscall.h \
        syscontr.C \
        syscontr.h \
        syssingleton.C \
-       textutils.h
+       translator.h \
+       textutils.h \
+       unlink.C