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 721e7b80b36c3d8a20ceeb35666bd920d60510ad..2193c1cd8a3b4d17319f6f05750c2fbcf83eae9a 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -2,9 +2,7 @@ include $(top_srcdir)/config/common.am
 
 noinst_LTLIBRARIES = libsupport.la
 
-CLEANFILES = path_defines.C
-
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+CLEANFILES += path_defines.C
 
 EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
 
@@ -14,6 +12,8 @@ endif
 
 BUILT_SOURCES = path_defines.C
 
+AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+
 libsupport_la_SOURCES = \
        FileInfo.C \
        FileInfo.h \
@@ -26,6 +26,8 @@ libsupport_la_SOURCES = \
        copied_ptr.h \
        cow_ptr.h \
        debugstream.h \
+       filefilterlist.C \
+       filefilterlist.h \
        filename.C \
        filename.h \
        filetools.C \
@@ -44,14 +46,12 @@ libsupport_la_SOURCES = \
        lstrings.C \
        lstrings.h \
        lyxalgo.h \
-       lyxfunctional.h \
        lyxlib.h \
        lyxmanip.h \
        lyxtime.C \
        lyxtime.h \
        lyxsum.C \
        mkdir.C \
-       nt_defines.h \
        os.C \
        os.h \
        os2_defines.h \
@@ -63,14 +63,10 @@ libsupport_la_SOURCES = \
        putenv.C \
        rename.C \
        rmdir.C \
-       snprintf.h \
-       snprintf.c \
        socktools.C \
        socktools.h \
-       sstream.h \
        std_istream.h \
        std_ostream.h \
-       std_sstream.h \
        systemcall.C \
        systemcall.h \
        tempname.C \