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 76eb046a50164894b7a41275a365250eccf8de5f..5633ecfaa45d58ec1e05e7f56d779fdd208cebc5 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,14 +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++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = -I${srcdir}/../ $(BOOST_INCLUDES)
+
+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 types.h
+             os_unix.C os_win32.C os_os2.C
 
 if USE_LYXSTRING
 LYXSTRING = lyxstring.C lyxstring.h
@@ -42,6 +39,10 @@ libsupport_la_SOURCES = \
        filetools.C \
        filetools.h \
        fmt.C \
+       forkedcall.C \
+       forkedcall.h \
+       forkedcontr.C \
+       forkedcontr.h \
        getUserName.C \
        getcwd.C \
        kill.C \
@@ -54,6 +55,9 @@ libsupport_la_SOURCES = \
        lyxmanip.h \
        $(LYXSTRING) lyxsum.C \
        mkdir.C \
+       nt_defines.h \
+       os2_defines.h \
+       os2_errortable.h \
        path.C \
        path.h \
        putenv.C \
@@ -63,14 +67,11 @@ libsupport_la_SOURCES = \
        snprintf.h \
        snprintf.c \
        sstream.h \
-       $(REGEX) syscall.C \
-       syscall.h \
-       syscontr.C \
-       syscontr.h \
-       syssingleton.C \
+       $(REGEX) systemcall.C \
+       systemcall.h \
        tempname.C \
-       translator.h \
        textutils.h \
+       translator.h \
+       types.h \
        unlink.C \
        utility.h
-