add <string> and other small fixes to make

[lyx.git] / src / graphics / Makefile.am

diff --git a/src/graphics/Makefile.am b/src/graphics/Makefile.am
index dd6d51661ecaa5bfa11e31f55592513170802c48..6a73c0b59d7b82c2dbdd0ecbf71d1a6656d50330 100644 (file)
--- a/src/graphics/Makefile.am
+++ b/src/graphics/Makefile.am
@@ -1,18 +1,31 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libgraphics.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
 
-libgraphics_o_SOURCES = \
+noinst_LTLIBRARIES = libgraphics.la
+
+INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
+
+libgraphics_la_SOURCES = \
        GraphicsCache.h \
        GraphicsCache.C \
        GraphicsCacheItem.h \
        GraphicsCacheItem.C \
-       ImageLoaderXPM.h \
-       ImageLoaderXPM.C \
-       ImageLoader.h \
-       ImageLoader.C 
+       GraphicsConverter.h \
+       GraphicsConverter.C \
+       GraphicsImage.h \
+       GraphicsImage.C \
+       GraphicsLoader.h \
+       GraphicsLoader.C \
+       GraphicsParams.C \
+       GraphicsParams.h \
+       LoaderQueue.h \
+       LoaderQueue.C \
+       GraphicsTypes.h \
+       GraphicsTypes.C \
+       PreviewImage.h \
+       PreviewImage.C \
+       PreviewLoader.h \
+       PreviewLoader.C \
+       Previews.h \
+       Previews.C \
+       PreviewedInset.h \
+       PreviewedInset.C