-AUTOMAKE_OPTIONS = foreign
-pkglib_LTLIBRARIES = libsupport.la
-LIBS =
-ETAGS_ARGS = --c++
-INCLUDES = -I${srcdir}/../
+include $(top_srcdir)/config/common.am
+
+noinst_LTLIBRARIES = libsupport.la
+
+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