From 9b4576b50b704d501a2d65ad347e9bbbed1a0d00 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 8 Apr 2010 10:25:50 +0000
Subject: [PATCH] Use the subdir-object option of automake so that the .o files
 are put in the same directory as their source. The other visible gain is that
 the size of src/Makefile is divided by 3 with automake >= 1.9.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34090 a592a061-630c-0410-9148-cb99ea01b6c8
---
 configure.ac    |  3 ++-
 src/Makefile.am | 34 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 565dd89ff5..0cc3e61d4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ fi
 AM_MAINTAINER_MODE
 
 save_PACKAGE=$PACKAGE
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define subdir-objects 1.8])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 PACKAGE=$save_PACKAGE
 
@@ -67,6 +67,7 @@ AC_C_BIGENDIAN
 LYX_USE_FRONTENDS
 
 ### Check for a C++ compiler
+AM_PROG_CC_C_O
 LYX_PROG_CXX
 
 ### Objective-C compiler
diff --git a/src/Makefile.am b/src/Makefile.am
index e6c2dacf41..5154354be2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,11 +24,11 @@ bin_PROGRAMS = lyx
 
 lyx_LDADD = \
 	liblyxcore.a \
-	liblyxmathed.a \
-	liblyxinsets.a \
+	mathed/liblyxmathed.a \
+	insets/liblyxinsets.a \
 	frontends/liblyxfrontends.a \
 	frontends/qt4/liblyxqt4.a \
-	liblyxgraphics.a \
+	graphics/liblyxgraphics.a \
 	support/liblyxsupport.a \
 	$(OTHERLIBS) \
 	$(QT4_LDFLAGS) \
@@ -322,9 +322,9 @@ liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 
 ############################### Graphics ##############################
 
-noinst_LIBRARIES += liblyxgraphics.a
+noinst_LIBRARIES += graphics/liblyxgraphics.a
 
-liblyxgraphics_a_SOURCES = \
+graphics_liblyxgraphics_a_SOURCES = \
 	graphics/GraphicsCache.h \
 	graphics/GraphicsCache.cpp \
 	graphics/GraphicsCacheItem.h \
@@ -349,7 +349,7 @@ liblyxgraphics_a_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-noinst_LIBRARIES += liblyxmathed.a
+noinst_LIBRARIES += mathed/liblyxmathed.a
 
 SOURCEFILESMATHED = \
 	mathed/InsetMathAMSArray.cpp \
@@ -487,25 +487,25 @@ HEADERFILESMATHED = \
 	mathed/MathSupport.h \
 	mathed/TextPainter.h
 
-lyxmathed.cpp:
+mathed/lyxmathed.cpp:
 	@echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
 
 if MONOLITHIC_MATHED
 
-BUILT_SOURCES += lyxmathed.cpp
-CLEANFILES += lyxmathed.cpp
+BUILT_SOURCES += mathed/lyxmathed.cpp
+CLEANFILES += mathed/lyxmathed.cpp
 
-liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
+mathed_liblyxmathed_a_SOURCES = mathed/lyxmathed.cpp $(HEADERFILESMATHED)
 
 else
 
-liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
+mathed_liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
 
 endif
 
 ############################### Insets  ##############################
 
-noinst_LIBRARIES += liblyxinsets.a
+noinst_LIBRARIES += insets/liblyxinsets.a
 
 SOURCEFILESINSETS = \
 	insets/ExternalSupport.cpp \
@@ -620,18 +620,18 @@ HEADERFILESINSETS = \
 #	insets/InsetSection.h \
 #	insets/InsetSection.cpp
 
-lyxinsets.cpp:
+insets/lyxinsets.cpp:
 	@echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@
 
 if MONOLITHIC_INSETS
 
-BUILT_SOURCES += lyxinsets.cpp
-CLEANFILES += lyxinsets.cpp
+BUILT_SOURCES += insets/lyxinsets.cpp
+CLEANFILES += insets/lyxinsets.cpp
 
-liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
+insets_liblyxinsets_a_SOURCES = insets/lyxinsets.cpp $(HEADERFILESINSETS)
 
 else
 
-liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
+insets_liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
 endif
-- 
2.39.5