another safety belt

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 7d5070b0961c504028ee3a4c3a9a3e63c89ebc87..6323abc82164651cfa78252eaa842937bf3182ce 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,78 +1,65 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
+
 noinst_LTLIBRARIES = libsupport.la
-LIBS =
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = -I${srcdir}/../ $(BOOST_INCLUDES)
 
-EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h \
-             os_unix.C os_win32.C os_os2.C
+INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+
+EXTRA_DIST = lyxstring.C lyxstring.h \
+            os_unix.C os_win32.C os_os2.C
 
 if USE_LYXSTRING
 LYXSTRING = lyxstring.C lyxstring.h
 endif
-if USE_REGEX
-REGEX = regex.c lyxregex.h
-endif
 
 libsupport_la_SOURCES = \
        DebugStream.C \
        DebugStream.h \
        FileInfo.C \
        FileInfo.h \
+       FileMonitor.h \
+       FileMonitor.C \
        LAssert.C \
        LAssert.h \
        LIstream.h \
        LOstream.h \
-       LRegex.C \
-       LRegex.h \
-       LSubstring.C \
-       LSubstring.h \
        os.C \
        os.h \
-       StrPool.C \
-       StrPool.h \
        abort.C \
        atoi.C \
        chdir.C \
        copy.C \
-       date.C \
        filetools.C \
        filetools.h \
-       fmt.C \
-       getUserName.C \
+       forkedcall.C \
+       forkedcall.h \
+       forkedcontr.C \
+       forkedcontr.h \
        getcwd.C \
        kill.C \
+       limited_stack.h \
        lstrings.C \
        lstrings.h \
-       lxtl.h \
        lyxalgo.h \
        lyxfunctional.h \
        lyxlib.h \
        lyxmanip.h \
        $(LYXSTRING) lyxsum.C \
        mkdir.C \
+       nt_defines.h \
+       os2_defines.h \
+       os2_errortable.h \
        path.C \
        path.h \
        putenv.C \
        rename.C \
        rmdir.C \
-       smart_ptr.h \
        snprintf.h \
        snprintf.c \
        sstream.h \
-       $(REGEX) systemcall.C \
+       systemcall.C \
        systemcall.h \
        tempname.C \
        textutils.h \
        translator.h \
        types.h \
-       unlink.C \
-       utility.h
-
-libsupport.la: libsupport.o
-
-libsupport.o: $(libsupport_la_OBJECTS) $(libsupport_la_DEPENDENCIES)
-       $(CXXLINK) $(libsupport_la_OBJECTS)
+       unlink.C