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 7ee6393d97e1a4a949623177962e65e69d674867..6a73c0b59d7b82c2dbdd0ecbf71d1a6656d50330 100644 (file)
--- a/src/graphics/Makefile.am
+++ b/src/graphics/Makefile.am
@@ -2,13 +2,7 @@ include $(top_srcdir)/config/common.am
 
 noinst_LTLIBRARIES = libgraphics.la
 
-INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
-
-EXTRA_DIST = GraphicsImageXPM.C GraphicsImageXPM.h
-
-if USE_BASIC_IMAGE_LOADER
-GRAPHICSIMAGEXPM = GraphicsImageXPM.C GraphicsImageXPM.h
-endif
+INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 libgraphics_la_SOURCES = \
        GraphicsCache.h \
@@ -19,11 +13,19 @@ libgraphics_la_SOURCES = \
        GraphicsConverter.C \
        GraphicsImage.h \
        GraphicsImage.C \
-       $(GRAPHICSIMAGEXPM) GraphicsParams.C \
+       GraphicsLoader.h \
+       GraphicsLoader.C \
+       GraphicsParams.C \
        GraphicsParams.h \
-       GraphicsTypes.h
-
-libgraphics.la: libgraphics.o
-
-libgraphics.o: $(libgraphics_la_OBJECTS) $(libgraphics_la_DEPENDENCIES)
-       $(CXXLINK) $(libgraphics_la_OBJECTS)
+       LoaderQueue.h \
+       LoaderQueue.C \
+       GraphicsTypes.h \
+       GraphicsTypes.C \
+       PreviewImage.h \
+       PreviewImage.C \
+       PreviewLoader.h \
+       PreviewLoader.C \
+       Previews.h \
+       Previews.C \
+       PreviewedInset.h \
+       PreviewedInset.C