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 b81cd36295513c55250903104647797c1ab37772..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
+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 \
@@ -139,8 +138,3 @@ libmathed_la_SOURCES = \
        math_xyarrowinset.h \
        math_xymatrixinset.C \
        math_xymatrixinset.h
-
-libmathed.la: libmathed.o
-
-libmathed.o: $(libmathed_la_OBJECTS) $(libmathed_la_DEPENDENCIES)
-       $(CXXLINK) $(libmathed_la_OBJECTS)