Next step of true unicode filenames: Use support::FileName instead of

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index de6adecb9c6387474a856a33739525f7eb056729..b3c3f775e37265c0c77f7c0b4884d1f2dc70df33 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,26 +1,25 @@
 include $(top_srcdir)/config/common.am
 
-noinst_LTLIBRARIES = libsupport.la
+SUBDIRS = . tests
+
+CLEANFILES += $(BUILT_SOURCES)
 
-CLEANFILES += path_defines.C
+EXTRA_DIST = package.C.in pch.h \
+       os_cygwin.C os_unix.C os_win32.C os_win32.h
 
-EXTRA_DIST = package.C.in os_unix.C os_win32.C os_os2.C
+noinst_LTLIBRARIES = libsupport.la
 
-if USE_COMPRESSION
-COMPRESSION = gzstream.C gzstream.h
-endif
+libsupport_la_LIBADD = $(LIBSHLWAPI)
 
-BUILT_SOURCES = package.C
+BUILT_SOURCES = $(PCH_FILE) package.C
 
-AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 libsupport_la_SOURCES = \
-       FileInfo.C \
-       FileInfo.h \
        FileMonitor.h \
        FileMonitor.C \
+       RandomAccessList.h \
        abort.C \
-       atoi.C \
        chdir.C \
        convert.C \
        convert.h \
@@ -28,22 +27,30 @@ libsupport_la_SOURCES = \
        copied_ptr.h \
        cow_ptr.h \
        debugstream.h \
+       docstream.C \
+       docstream.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 \
-       globbing.C \
-       globbing.h \
-       $(COMPRESSION) kill.C \
+       kill.C \
        limited_stack.h \
        lstrings.C \
        lstrings.h \
@@ -56,15 +63,11 @@ libsupport_la_SOURCES = \
        mkdir.C \
        os.C \
        os.h \
-       os2_defines.h \
-       os2_errortable.h \
        path.C \
        path.h \
        package.C \
        package.h \
-       putenv.C \
        rename.C \
-       rmdir.C \
        socktools.C \
        socktools.h \
        std_istream.h \
@@ -77,18 +80,20 @@ libsupport_la_SOURCES = \
        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 ;\
-       ABS_SRCDIR=`cd $(top_srcdir) && pwd` ;\
-       ABS_BUILDDIR=`cd ../.. && pwd` ;\
-       sed "s,%LYX_DIR%,$(pkgdatadir), ;\
-               s,%LOCALEDIR%,$(datadir)/locale, ;\
-               s,%TOP_SRCDIR%,$${ABS_SRCDIR}," \
+       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 ;\