some new (not extensive) changes, some fixes, will probably reverto to .la libs later...

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 45fa24ee8d5c6674b0c0697dafc74327e1ac1536..959ba0281a9dec4bc9c099f842eb532ff9cd4c7b 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,24 +1,37 @@
 AUTOMAKE_OPTIONS = foreign
-noinst_LIBRARIES = libsupport.a
-libsupport_a_LIBADD = @LIBOBJS@
+noinst_LTLIBRARIES = libsupport.la
+LIBS =
 ETAGS_ARGS = --c++
 INCLUDES = -I${srcdir}/../
-libsupport_a_SOURCES = \
+
+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.h \
+       LIstream.h \
+       LOstream.h \
+       LRegex.C \
+       LRegex.h \
+       LSubstring.C \
+       LSubstring.h \
+       block.h \
        filetools.C \
        filetools.h \
        lstrings.C \
        lstrings.h \
        lyxlib.h \
-       lyxstring.C \
-       lyxstring.h \
-       lyxsum.C \
+       $(LYXSTRING) lyxsum.C \
        path.h \
-       syscall.C \
+       $(REGEX) syscall.C \
        syscall.h \
        syscontr.C \
        syscontr.h \