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 2fa5c1e570ac5ae143c9dd50731467846445df38..20137977556ef19e8fcd7af3f79d3d89d1c55700 100644 (file)
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -1,44 +1,57 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libmathed.la
-LIBS=
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+include $(top_srcdir)/config/common.am
 
+noinst_LTLIBRARIES = libmathed.la
 
+INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
 
 libmathed_la_SOURCES = \
-       array.C \
-       array.h \
-       xarray.C \
-       xarray.h \
+       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_bigopinset.C \
-       math_bigopinset.h \
+       math_atom.C \
+       math_atom.h \
+       math_biginset.C \
+       math_biginset.h \
        math_binominset.C \
        math_binominset.h \
+       math_boxinset.C \
+       math_boxinset.h \
+       math_braceinset.C \
+       math_braceinset.h \
+       math_casesinset.C \
+       math_casesinset.h \
        math_charinset.C \
        math_charinset.h \
        math_cursor.C \
        math_cursor.h \
+       math_data.C \
+       math_data.h \
        math_decorationinset.C \
        math_decorationinset.h \
        math_defs.h \
        math_deliminset.C \
        math_deliminset.h \
+       math_diffinset.C \
+       math_diffinset.h \
        math_diminset.C \
        math_diminset.h \
        math_dotsinset.C \
        math_dotsinset.h \
+       math_extern.C \
+       math_extern.h \
+       math_exfuncinset.C \
+       math_exfuncinset.h \
+       math_exintinset.C \
+       math_exintinset.h \
        math_factory.C \
        math_factory.h \
        math_fracinset.C \
@@ -52,8 +65,18 @@ libmathed_la_SOURCES = \
        math_gridinset.C \
        math_gridinset.h \
        math_hash.C \
+       math_hullinset.C \
+       math_hullinset.h \
        math_inset.C \
        math_inset.h \
+       math_iterator.C \
+       math_iterator.h \
+       math_kerninset.C \
+       math_kerninset.h \
+       math_lefteqninset.C \
+       math_lefteqninset.h \
+       math_limitopinset.C \
+       math_limitopinset.h \
        math_macro.C \
        math_macro.h \
        math_macroarg.C \
@@ -62,30 +85,56 @@ libmathed_la_SOURCES = \
        math_macrotemplate.h \
        math_macrotable.C \
        math_macrotable.h \
+       math_mathmlstream.C \
+       math_mathmlstream.h \
        math_matrixinset.C \
        math_matrixinset.h \
+       math_metricsinfo.h \
+       math_metricsinfo.C \
        math_nestinset.C \
        math_nestinset.h \
-       math_noglyphinset.C \
-       math_noglyphinset.h \
+       math_notinset.C \
+       math_notinset.h \
        math_parser.C \
        math_parser.h \
+       math_pos.C \
+       math_pos.h \
+       math_replace.h \
        math_rootinset.C \
        math_rootinset.h \
-       math_scopeinset.C \
-       math_scopeinset.h \
        math_scriptinset.C \
        math_scriptinset.h \
        math_sizeinset.C \
        math_sizeinset.h \
        math_spaceinset.C \
        math_spaceinset.h \
+       math_specialcharinset.C \
+       math_specialcharinset.h \
+       math_splitinset.C \
+       math_splitinset.h \
        math_sqrtinset.C \
        math_sqrtinset.h \
        math_stackrelinset.C \
        math_stackrelinset.h \
+       math_streamstr.C \
+       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 \
-       support.C \
-       support.h \
-       symbol_def.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_xyarrowinset.C \
+       math_xyarrowinset.h \
+       math_xymatrixinset.C \
+       math_xymatrixinset.h