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 6323abc82164651cfa78252eaa842937bf3182ce..de535eebb3c643c15e3d92f09feaa894ea9e6673 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,65 +1,101 @@
 include $(top_srcdir)/config/common.am
 
+SUBDIRS = . tests
+
+CLEANFILES += $(BUILT_SOURCES)
+
+EXTRA_DIST = package.C.in pch.h \
+       os_cygwin.C os_unix.C os_win32.C os_win32.h
+
 noinst_LTLIBRARIES = libsupport.la
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+libsupport_la_LIBADD = $(LIBSHLWAPI)
 
-EXTRA_DIST = lyxstring.C lyxstring.h \
-            os_unix.C os_win32.C os_os2.C
+BUILT_SOURCES = $(PCH_FILE) package.C
 
-if USE_LYXSTRING
-LYXSTRING = lyxstring.C lyxstring.h
-endif
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 libsupport_la_SOURCES = \
-       DebugStream.C \
-       DebugStream.h \
-       FileInfo.C \
-       FileInfo.h \
        FileMonitor.h \
        FileMonitor.C \
-       LAssert.C \
-       LAssert.h \
-       LIstream.h \
-       LOstream.h \
-       os.C \
-       os.h \
+       RandomAccessList.h \
        abort.C \
-       atoi.C \
        chdir.C \
+       convert.C \
+       convert.h \
        copy.C \
+       copied_ptr.h \
+       cow_ptr.h \
+       debugstream.h \
+       docstring.C \
+       docstring.h \
+       environment.h \
+       environment.C \
+       filefilterlist.C \
+       filefilterlist.h \
+       filename.C \
+       filename.h \
        filetools.C \
        filetools.h \
+       fontutils.C \
+       fontutils.h \
        forkedcall.C \
        forkedcall.h \
+       forkedcallqueue.C \
+       forkedcallqueue.h \
        forkedcontr.C \
        forkedcontr.h \
+       fs_extras.C \
+       fs_extras.h \
        getcwd.C \
        kill.C \
        limited_stack.h \
        lstrings.C \
        lstrings.h \
        lyxalgo.h \
-       lyxfunctional.h \
        lyxlib.h \
        lyxmanip.h \
-       $(LYXSTRING) lyxsum.C \
+       lyxtime.C \
+       lyxtime.h \
+       lyxsum.C \
        mkdir.C \
-       nt_defines.h \
-       os2_defines.h \
-       os2_errortable.h \
+       os.C \
+       os.h \
        path.C \
        path.h \
-       putenv.C \
+       package.C \
+       package.h \
        rename.C \
-       rmdir.C \
-       snprintf.h \
-       snprintf.c \
-       sstream.h \
+       socktools.C \
+       socktools.h \
+       std_istream.h \
+       std_ostream.h \
        systemcall.C \
        systemcall.h \
        tempname.C \
        textutils.h \
        translator.h \
        types.h \
+       userinfo.C \
+       userinfo.h \
+       unicode.C \
+       unicode.h \
        unlink.C
+
+
+package.C: build_package
+
+# Solaris sed does not like spaces bewteen the ;-delimited commands
+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,%PROGRAM_SUFFIX%,$(program_suffix)," \
+               $(srcdir)/package.C.in > tmp_package ;\
+       if cmp -s tmp_package package.C ; then \
+               rm -f tmp_package ;\
+       else \
+               rm -f package.C ;\
+               mv tmp_package package.C ;\
+       fi