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 7d5070b0961c504028ee3a4c3a9a3e63c89ebc87..5633ecfaa45d58ec1e05e7f56d779fdd208cebc5 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,11 +1,8 @@
-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
@@ -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 \
@@ -71,8 +75,3 @@ libsupport_la_SOURCES = \
        types.h \
        unlink.C \
        utility.h
-
-libsupport.la: libsupport.o
-
-libsupport.o: $(libsupport_la_OBJECTS) $(libsupport_la_DEPENDENCIES)
-       $(CXXLINK) $(libsupport_la_OBJECTS)