makefile cleanup, and avoid some warnings

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

diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am
index a3963baff5c4b8d5f4086075eb31a6cfe29047d8..20137977556ef19e8fcd7af3f79d3d89d1c55700 100644 (file)
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -1,31 +1,32 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
+
 noinst_LTLIBRARIES = libmathed.la
-LIBS=
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+
+INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
 
 libmathed_la_SOURCES = \
+       textpainter.C \
+       textpainter.h \
        formulabase.C \
        formulabase.h \
        formula.C \
        formula.h \
        formulamacro.C \
        formulamacro.h \
+       math_amsarrayinset.C \
+       math_amsarrayinset.h \
        math_arrayinset.C \
        math_arrayinset.h \
        math_atom.C \
        math_atom.h \
+       math_biginset.C \
+       math_biginset.h \
        math_binominset.C \
        math_binominset.h \
-       math_braceinset.C \
-       math_braceinset.h \
        math_boxinset.C \
        math_boxinset.h \
-       math_binaryopinset.C \
-       math_binaryopinset.h \
+       math_braceinset.C \
+       math_braceinset.h \
        math_casesinset.C \
        math_casesinset.h \
        math_charinset.C \
@@ -96,6 +97,8 @@ libmathed_la_SOURCES = \
        math_notinset.h \
        math_parser.C \
        math_parser.h \
+       math_pos.C \
+       math_pos.h \
        math_replace.h \
        math_rootinset.C \
        math_rootinset.h \
@@ -117,11 +120,21 @@ libmathed_la_SOURCES = \
        math_streamstr.h \
        math_stringinset.C \
        math_stringinset.h \
+       math_substackinset.C \
+       math_substackinset.h \
        math_support.C \
        math_support.h \
        math_symbolinset.C \
        math_symbolinset.h \
        math_unknowninset.C \
        math_unknowninset.h \
+       math_undersetinset.C \
+       math_undersetinset.h \
+       math_xarrowinset.C \
+       math_xarrowinset.h \
        math_xdata.C \
-       math_xdata.h
+       math_xdata.h \
+       math_xyarrowinset.C \
+       math_xyarrowinset.h \
+       math_xymatrixinset.C \
+       math_xymatrixinset.h