Remove cached var from RenderPreview. Changes elsewhere to suit.

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 55d486b7d1818466882b372bb38dd94648d10d07..721e7b80b36c3d8a20ceeb35666bd920d60510ad 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,40 +1,31 @@
 include $(top_srcdir)/config/common.am
 
-nodist_include_HEADERS = path_defines.C
 noinst_LTLIBRARIES = libsupport.la
 
 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
+EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
 
-if USE_LYXSTRING
-LYXSTRING = lyxstring.C lyxstring.h
+if USE_COMPRESSION
+COMPRESSION = gzstream.C gzstream.h
 endif
 
 BUILT_SOURCES = path_defines.C
 
 libsupport_la_SOURCES = \
-       BoostFormat.h \
-       DebugStream.C \
-       DebugStream.h \
        FileInfo.C \
        FileInfo.h \
        FileMonitor.h \
        FileMonitor.C \
-       LAssert.C \
-       LAssert.h \
-       LIstream.h \
-       LOstream.h \
-       os.C \
-       os.h \
        abort.C \
        atoi.C \
-       boost-inst.C \
        chdir.C \
        copy.C \
+       copied_ptr.h \
+       cow_ptr.h \
+       debugstream.h \
        filename.C \
        filename.h \
        filetools.C \
@@ -46,7 +37,9 @@ libsupport_la_SOURCES = \
        forkedcontr.C \
        forkedcontr.h \
        getcwd.C \
-       kill.C \
+       globbing.C \
+       globbing.h \
+       $(COMPRESSION) kill.C \
        limited_stack.h \
        lstrings.C \
        lstrings.h \
@@ -56,20 +49,28 @@ libsupport_la_SOURCES = \
        lyxmanip.h \
        lyxtime.C \
        lyxtime.h \
-       $(LYXSTRING) lyxsum.C \
+       lyxsum.C \
        mkdir.C \
        nt_defines.h \
+       os.C \
+       os.h \
        os2_defines.h \
        os2_errortable.h \
        path.C \
        path.h \
        path_defines.C \
+       path_defines.h \
        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 \
@@ -88,8 +89,10 @@ path_defines.C: build_path_defines
 build_path_defines: path_defines.C.in
        @rm -f tmp_path_defines ;\
        ABS_SRCDIR=`cd $(top_srcdir) && pwd` ;\
+       ABS_BUILDDIR=`cd ../.. && pwd` ;\
        sed "s,%LYX_DIR%,$(pkgdatadir), ;\
                s,%LOCALEDIR%,$(datadir)/locale, ;\
+               s,%BUILDDIR%,$${ABS_BUILDDIR}, ;\
                s,%TOP_SRCDIR%,$${ABS_SRCDIR}," \
                $(srcdir)/path_defines.C.in > tmp_path_defines ;\
        if cmp -s tmp_path_defines path_defines.C ; then \