the convert patch

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 8580cbaf58c2a9820c707859e8f284c3589adbe4..47ad20e263eefc954b5a3b596dd761f6435956f3 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,86 +1,99 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
+
+SUBDIRS = . tests
+
 noinst_LTLIBRARIES = libsupport.la
-LIBS =
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)
-INCLUDES = -I${srcdir}/../ $(SIGC_INCLUDES) $(BOOST_INCLUDES)
 
-EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h \
-             os_unix.C os_win32.C os_os2.C
+CLEANFILES += path_defines.C
 
-if USE_LYXSTRING
-LYXSTRING = lyxstring.C lyxstring.h
-endif
-if USE_REGEX
-REGEX = regex.c lyxregex.h
+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 = package.C
+
+AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+
 libsupport_la_SOURCES = \
-       DebugStream.C \
-       DebugStream.h \
        FileInfo.C \
        FileInfo.h \
-       LAssert.C \
-       LAssert.h \
-       LIstream.h \
-       LOstream.h \
-       LRegex.C \
-       LRegex.h \
-       LSubstring.C \
-       LSubstring.h \
-       os.C \
-       os.h \
-       StrPool.C \
-       StrPool.h \
+       FileMonitor.h \
+       FileMonitor.C \
        abort.C \
-       atoi.C \
        chdir.C \
+       convert.C \
+       convert.h \
        copy.C \
-       date.C \
+       copied_ptr.h \
+       cow_ptr.h \
+       debugstream.h \
+       filefilterlist.C \
+       filefilterlist.h \
+       filename.C \
+       filename.h \
        filetools.C \
        filetools.h \
-       fmt.C \
        forkedcall.C \
        forkedcall.h \
+       forkedcallqueue.C \
+       forkedcallqueue.h \
        forkedcontr.C \
        forkedcontr.h \
-       getUserName.C \
        getcwd.C \
-       kill.C \
+       globbing.C \
+       globbing.h \
+       $(COMPRESSION) kill.C \
+       limited_stack.h \
        lstrings.C \
        lstrings.h \
-       lxtl.h \
        lyxalgo.h \
-       lyxfunctional.h \
        lyxlib.h \
        lyxmanip.h \
-       $(LYXSTRING) lyxsum.C \
+       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 \
+       package.C \
+       package.h \
        putenv.C \
        rename.C \
        rmdir.C \
-       smart_ptr.h \
-       snprintf.h \
-       snprintf.c \
-       sstream.h \
-       $(REGEX) systemcall.C \
+       socktools.C \
+       socktools.h \
+       std_istream.h \
+       std_ostream.h \
+       systemcall.C \
        systemcall.h \
        tempname.C \
        textutils.h \
        translator.h \
        types.h \
-       unlink.C \
-       utility.h
+       userinfo.C \
+       userinfo.h \
+       unlink.C
+
 
-libsupport.la: libsupport.o
+package.C: build_package
 
-libsupport.o: $(libsupport_la_OBJECTS) $(libsupport_la_DEPENDENCIES)
-       $(CXXLINK) $(libsupport_la_OBJECTS)
+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}," \
+               $(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