X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=5633ecfaa45d58ec1e05e7f56d779fdd208cebc5;hb=c8089f8bf9d66c8428e8869895c61145ee4dd5e9;hp=1aa751be3cf9637c31bba13e38754babb943ab3b;hpb=7ec7c9da44662529e8a0ad4d60836df43a059ecd;p=features.git

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 1aa751be3c..5633ecfaa4 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,13 +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)
 
-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
@@ -29,6 +27,8 @@ libsupport_la_SOURCES = \
 	LRegex.h \
 	LSubstring.C \
 	LSubstring.h \
+	os.C \
+	os.h \
 	StrPool.C \
 	StrPool.h \
 	abort.C \
@@ -39,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 \
@@ -51,20 +55,23 @@ 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 \
 	rename.C \
 	rmdir.C \
+	smart_ptr.h \
 	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 \
-	unlink.C
+	translator.h \
+	types.h \
+	unlink.C \
+	utility.h