makefile cleanup, and avoid some warnings

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 2bc70a97f7b0f6704359bf243d2140f55d8db61a..5633ecfaa45d58ec1e05e7f56d779fdd208cebc5 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,12 +1,11 @@
-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++
-INCLUDES = -I${srcdir}/../
 
-EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h
+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
 
 if USE_LYXSTRING
 LYXSTRING = lyxstring.C lyxstring.h
@@ -28,14 +27,22 @@ libsupport_la_SOURCES = \
        LRegex.h \
        LSubstring.C \
        LSubstring.h \
+       os.C \
+       os.h \
        StrPool.C \
        StrPool.h \
        abort.C \
-       block.h \
+       atoi.C \
        chdir.C \
+       copy.C \
        date.C \
        filetools.C \
        filetools.h \
+       fmt.C \
+       forkedcall.C \
+       forkedcall.h \
+       forkedcontr.C \
+       forkedcontr.h \
        getUserName.C \
        getcwd.C \
        kill.C \
@@ -43,18 +50,28 @@ libsupport_la_SOURCES = \
        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 \
-       $(REGEX) syscall.C \
-       syscall.h \
-       syscontr.C \
-       syscontr.h \
-       syssingleton.C \
-       translator.h \
+       rename.C \
+       rmdir.C \
+       smart_ptr.h \
+       snprintf.h \
+       snprintf.c \
+       sstream.h \
+       $(REGEX) systemcall.C \
+       systemcall.h \
+       tempname.C \
        textutils.h \
-       utility.hpp
+       translator.h \
+       types.h \
+       unlink.C \
+       utility.h