the convert patch

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 575e74faf1c05cf54e8085011cb415b37d7aa539..47ad20e263eefc954b5a3b596dd761f6435956f3 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,33 +1,36 @@
 include $(top_srcdir)/config/common.am
 
-noinst_LTLIBRARIES = libsupport.la
+SUBDIRS = . tests
 
-CLEANFILES = path_defines.C
+noinst_LTLIBRARIES = libsupport.la
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+CLEANFILES += path_defines.C
 
-EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
+EXTRA_DIST = package.C.in os_unix.C os_win32.C os_os2.C
 
 if USE_COMPRESSION
 COMPRESSION = gzstream.C gzstream.h
 endif
 
-BUILT_SOURCES = path_defines.C
+BUILT_SOURCES = package.C
+
+AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 libsupport_la_SOURCES = \
-       BoostFormat.h \
        FileInfo.C \
        FileInfo.h \
        FileMonitor.h \
        FileMonitor.C \
        abort.C \
-       atoi.C \
-       boost-inst.C \
        chdir.C \
+       convert.C \
+       convert.h \
        copy.C \
        copied_ptr.h \
        cow_ptr.h \
        debugstream.h \
+       filefilterlist.C \
+       filefilterlist.h \
        filename.C \
        filename.h \
        filetools.C \
@@ -39,44 +42,38 @@ libsupport_la_SOURCES = \
        forkedcontr.C \
        forkedcontr.h \
        getcwd.C \
+       globbing.C \
+       globbing.h \
        $(COMPRESSION) kill.C \
        limited_stack.h \
        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 \
        os2_errortable.h \
        path.C \
        path.h \
-       path_defines.C \
-       path_defines.h \
+       package.C \
+       package.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 \
        textutils.h \
-       tostr.h \
-       tostr.C \
        translator.h \
        types.h \
        userinfo.C \
@@ -84,20 +81,19 @@ libsupport_la_SOURCES = \
        unlink.C
 
 
-path_defines.C: build_path_defines
+package.C: build_package
 
-build_path_defines: path_defines.C.in
-       @rm -f tmp_path_defines ;\
+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,%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 \
-               rm -f tmp_path_defines ;\
+               $(srcdir)/package.C.in > tmp_package ;\
+       if cmp -s tmp_package package.C ; then \
+               rm -f tmp_package ;\
        else \
-               rm -f path_defines.C ;\
-               mv tmp_path_defines path_defines.C ;\
+               rm -f package.C ;\
+               mv tmp_package package.C ;\
        fi