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 abeebb67c513016ac18a3763a0c80f4de8ec9197..4278b992b99fa1b5a4aebb6da598bfe15d230b7a 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,23 +1,65 @@
 AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libsupport.a
-libsupport_a_LIBADD = @LIBOBJS@
-ETAGS_ARGS = --c++
-INCLUDES = -I${srcdir}/../
-libsupport_a_SOURCES = \
+DISTCLEANFILES= *.orig *.rej *~ *.bak core
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+noinst_LTLIBRARIES = libsupport.la
+LIBS =
+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
+
+if USE_LYXSTRING
+LYXSTRING = lyxstring.C lyxstring.h
+endif
+if USE_REGEX
+REGEX = regex.c lyxregex.h
+endif
+
+libsupport_la_SOURCES = \
+       DebugStream.C \
+       DebugStream.h \
        FileInfo.C \
        FileInfo.h \
+       LAssert.C \
        LAssert.h \
+       LIstream.h \
+       LOstream.h \
+       LRegex.C \
+       LRegex.h \
+       LSubstring.C \
+       LSubstring.h \
+       StrPool.C \
+       StrPool.h \
+       abort.C \
+       atoi.C \
+       chdir.C \
+       copy.C \
+       date.C \
        filetools.C \
        filetools.h \
+       getUserName.C \
+       getcwd.C \
+       kill.C \
        lstrings.C \
        lstrings.h \
+       lxtl.h \
+       lyxalgo.h \
        lyxlib.h \
-       lyxstring.C \
-       lyxstring.h \
-       lyxsum.C \
-       syscall.C \
+       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