On Fri, Mar 23, 2007 at 11:48:21PM +0100, Peter Kümmel wrote:
> Is the something like "configure --enable-final" for the auto tools?
> This is what I've "reinvented" for cmake.
I think we should just go for explicit "master files":
19 lines added, 59 removed, almost the same performance gain as
the "all in one file" solution. People can keep their small files,
and even the autobuild stuff is leaner.
I suppose this makes everybody happy.
Comments?
Andre'
Index: src/graphics/Graphics.C
===================================================================
--- src/graphics/Graphics.C (revision 0)
+++ src/graphics/Graphics.C (revision 0)
@@ -0,0 +1,11 @@
+#include "GraphicsCache.C"
+#include "GraphicsCacheItem.C"
+#include "GraphicsConverter.C"
+#include "GraphicsImage.C"
+#include "GraphicsLoader.C"
+#include "GraphicsParams.C"
+#include "GraphicsTypes.C"
+#include "LoaderQueue.C"
+#include "PreviewImage.C"
+#include "PreviewLoader.C"
+#include "Previews.C"
Index: src/graphics/pch.h
===================================================================
--- src/graphics/pch.h (revision 17461)
+++ src/graphics/pch.h (working copy)
@@ -1,17 +0,0 @@
-#include <config.h>
-
-#include <boost/function.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/signal.hpp>
-#include <boost/utility.hpp>
-
-#include <fstream>
-#include <iomanip>
-#include <iosfwd>
-#include <queue>
-#include <set>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
Index: src/graphics/Makefile.am
===================================================================
--- src/graphics/Makefile.am (revision 17461)
+++ src/graphics/Makefile.am (working copy)
@@ -1,33 +0,0 @@
-include $(top_srcdir)/config/common.am
-
-EXTRA_DIST = pch.h
-
-BUILT_SOURCES = $(PCH_FILE)
-
-noinst_LTLIBRARIES = libgraphics.la
-
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-
-libgraphics_la_SOURCES = \
- GraphicsCache.h \
- GraphicsCache.C \
- GraphicsCacheItem.h \
- GraphicsCacheItem.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
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (revision 17529)
+++ src/Makefile.am (working copy)
@@ -8,7 +8,7 @@
CLIENT = client
endif
-SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
+SUBDIRS = mathed insets support frontends . $(CLIENT) tex2lyx
EXTRA_DIST = config.h.in stamp-h.in version.C.in \
Sectioning.h \
@@ -22,7 +22,6 @@
frontends/libfrontends.la
LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
- graphics/libgraphics.la \
support/libsupport.la
BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM)
$(BOOST_IOSTREAMS)
@@ -284,7 +283,8 @@
version.C \
version.h \
vspace.C \
- vspace.h
+ vspace.h \
+ graphics/Graphics.C
version.C: stamp-version
@:
Index: configure.ac
===================================================================
--- configure.ac (revision 17461)
+++ configure.ac (working copy)
@@ -418,7 +418,6 @@
src/version.C-tmp:src/version.C.in \
src/tex2lyx/Makefile \
src/mathed/Makefile \
- src/graphics/Makefile \
src/insets/Makefile \
src/support/Makefile \
src/support/tests/Makefile \
