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 c72aaedc3a8f602e5c021fb9ca7a1376b756525e..20137977556ef19e8fcd7af3f79d3d89d1c55700 100644 (file)
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -1,13 +1,12 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libmathed.o
-LIBS=
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+include $(top_srcdir)/config/common.am
 
-libmathed_o_SOURCES = \
+noinst_LTLIBRARIES = libmathed.la
+
+INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+
+libmathed_la_SOURCES = \
+       textpainter.C \
+       textpainter.h \
        formulabase.C \
        formulabase.h \
        formula.C \
@@ -24,12 +23,10 @@ libmathed_o_SOURCES = \
        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 \