tostr -> convert and some bformat work

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index ae25732d74bac2e55dce97a4e512a3ce7673733d..2193c1cd8a3b4d17319f6f05750c2fbcf83eae9a 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -2,16 +2,9 @@ include $(top_srcdir)/config/common.am
 
 noinst_LTLIBRARIES = libsupport.la
 
-CLEANFILES = path_defines.C
+CLEANFILES += path_defines.C
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
-
-EXTRA_DIST = path_defines.C.in lyxstring.C lyxstring.h \
-            os_unix.C os_win32.C os_os2.C
-
-if USE_LYXSTRING
-LYXSTRING = lyxstring.C lyxstring.h
-endif
+EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
 
 if USE_COMPRESSION
 COMPRESSION = gzstream.C gzstream.h
@@ -19,21 +12,22 @@ endif
 
 BUILT_SOURCES = path_defines.C
 
+AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+
 libsupport_la_SOURCES = \
-       BoostFormat.h \
-       DebugStream.C \
-       DebugStream.h \
        FileInfo.C \
        FileInfo.h \
        FileMonitor.h \
        FileMonitor.C \
-       LAssert.C \
-       LAssert.h \
        abort.C \
        atoi.C \
-       boost-inst.C \
        chdir.C \
        copy.C \
+       copied_ptr.h \
+       cow_ptr.h \
+       debugstream.h \
+       filefilterlist.C \
+       filefilterlist.h \
        filename.C \
        filename.h \
        filetools.C \
@@ -45,19 +39,19 @@ libsupport_la_SOURCES = \
        forkedcontr.C \
        forkedcontr.h \
        getcwd.C \
+       globbing.C \
+       globbing.h \
        $(COMPRESSION) kill.C \
        limited_stack.h \
        lstrings.C \
        lstrings.h \
        lyxalgo.h \
-       lyxfunctional.h \
        lyxlib.h \
        lyxmanip.h \
        lyxtime.C \
        lyxtime.h \
-       $(LYXSTRING) lyxsum.C \
+       lyxsum.C \
        mkdir.C \
-       nt_defines.h \
        os.C \
        os.h \
        os2_defines.h \
@@ -69,13 +63,10 @@ libsupport_la_SOURCES = \
        putenv.C \
        rename.C \
        rmdir.C \
-       snprintf.h \
-       snprintf.c \
-       sstream.h \
+       socktools.C \
+       socktools.h \
        std_istream.h \
        std_ostream.h \
-       std_sstream.h \
-       std_string.h \
        systemcall.C \
        systemcall.h \
        tempname.C \