This commit moves system font initialization and restoration to new support/fontutils...

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 1e9187d75301e14a913f86e3b9b6dc2fabc73c5e..de535eebb3c643c15e3d92f09feaa894ea9e6673 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -4,13 +4,12 @@ SUBDIRS = . tests
 
 CLEANFILES += $(BUILT_SOURCES)
 
-EXTRA_DIST = package.C.in pch.h os_cygwin.C os_os2.C os_unix.C os_win32.C
+EXTRA_DIST = package.C.in pch.h \
+       os_cygwin.C os_unix.C os_win32.C os_win32.h
 
 noinst_LTLIBRARIES = libsupport.la
 
-if USE_COMPRESSION
-COMPRESSION = gzstream.C gzstream.h
-endif
+libsupport_la_LIBADD = $(LIBSHLWAPI)
 
 BUILT_SOURCES = $(PCH_FILE) package.C
 
@@ -19,6 +18,7 @@ AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 libsupport_la_SOURCES = \
        FileMonitor.h \
        FileMonitor.C \
+       RandomAccessList.h \
        abort.C \
        chdir.C \
        convert.C \
@@ -27,6 +27,8 @@ libsupport_la_SOURCES = \
        copied_ptr.h \
        cow_ptr.h \
        debugstream.h \
+       docstring.C \
+       docstring.h \
        environment.h \
        environment.C \
        filefilterlist.C \
@@ -35,6 +37,8 @@ libsupport_la_SOURCES = \
        filename.h \
        filetools.C \
        filetools.h \
+       fontutils.C \
+       fontutils.h \
        forkedcall.C \
        forkedcall.h \
        forkedcallqueue.C \
@@ -44,7 +48,7 @@ libsupport_la_SOURCES = \
        fs_extras.C \
        fs_extras.h \
        getcwd.C \
-       $(COMPRESSION) kill.C \
+       kill.C \
        limited_stack.h \
        lstrings.C \
        lstrings.h \
@@ -57,8 +61,6 @@ libsupport_la_SOURCES = \
        mkdir.C \
        os.C \
        os.h \
-       os2_defines.h \
-       os2_errortable.h \
        path.C \
        path.h \
        package.C \
@@ -76,6 +78,8 @@ libsupport_la_SOURCES = \
        types.h \
        userinfo.C \
        userinfo.h \
+       unicode.C \
+       unicode.h \
        unlink.C
 
 
@@ -86,7 +90,8 @@ build_package: package.C.in
        @rm -f tmp_package ;\
        sed "s,%LYX_DIR%,$(LYX_ABS_INSTALLED_DATADIR),;\
 s,%LOCALEDIR%,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
-s,%TOP_SRCDIR%,$(LYX_ABS_TOP_SRCDIR)," \
+s,%TOP_SRCDIR%,$(LYX_ABS_TOP_SRCDIR),;\
+s,%PROGRAM_SUFFIX%,$(program_suffix)," \
                $(srcdir)/package.C.in > tmp_package ;\
        if cmp -s tmp_package package.C ; then \
                rm -f tmp_package ;\