From e6fe0de0522eabb07ce5b8ec96334ef745a66d16 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 20 Feb 2002 22:57:44 +0000 Subject: [PATCH] cleaner ld -r git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3580 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/Makefile.am | 13 +++++++++---- src/frontends/support/Makefile.am | 9 +++++++-- src/graphics/Makefile.am | 9 +++++++-- src/insets/Makefile.am | 9 +++++++-- src/mathed/Makefile.am | 9 +++++++-- src/support/Makefile.am | 8 ++++++-- 6 files changed, 43 insertions(+), 14 deletions(-) diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index 2c155a9ea9..9954cb3714 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -9,19 +9,19 @@ ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = ${FRONTEND_INCLUDES} -I${srcdir}/.. -I${srcdir}/xforms ${SIGC_CFLAGS} $(BOOST_INCLUDES) LIBS = -noinst_LTLIBRARIES = libfrontends.o +noinst_LTLIBRARIES = libfrontends.la -libfrontends_o_LIBADD= \ +libfrontends_la_LIBADD= \ xforms/*.lo \ controllers/*.lo \ support/libfrontendsupport.o -libfrontends_o_DEPENDENCIES = \ +libfrontends_la_DEPENDENCIES = \ xforms/*.lo \ controllers/*.lo \ support/libfrontendsupport.o -libfrontends_o_SOURCES=\ +libfrontends_la_SOURCES=\ Alert.C \ Alert.h \ Alert_pimpl.h \ @@ -39,6 +39,11 @@ libfrontends_o_SOURCES=\ Toolbar.C \ Toolbar.h +libfrontends.la: libfrontends.o + +libfrontends.o: $(libfrontends_la_OBJECTS) $(libfrontends_la_DEPENDENCIES) + $(CXXLINK) $(libfrontends_la_OBJECTS) $(libfrontends_la_LIBADD) + EXTRA_DIST = qt2 gnome dist-hook: diff --git a/src/frontends/support/Makefile.am b/src/frontends/support/Makefile.am index e227dc1390..6ac2f9bc88 100644 --- a/src/frontends/support/Makefile.am +++ b/src/frontends/support/Makefile.am @@ -1,15 +1,20 @@ AUTOMAKE_OPTIONS = foreign 1.4 DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libfrontendsupport.o +noinst_LTLIBRARIES = libfrontendsupport.la LIBS = ETAGS_ARGS = --lang=c++ INCLUDES = -I${srcdir}/../../ $(SIGC_CFLAGS) -libfrontendsupport_o_SOURCES = \ +libfrontendsupport_la_SOURCES = \ LyXImage.h \ LyXImage.C +libfrontendsupport.la: libfrontendsupport.o + +libfrontendsupport.o: $(libfrontendsupport_la_OBJECTS) $(libfrontendsupport_la_DEPENDENCIES) + $(CXXLINK) $(libfrontendsupport_la_OBJECTS) + EXTRA_DIST = \ LyXImage_X.h \ LyXImage_X.C diff --git a/src/graphics/Makefile.am b/src/graphics/Makefile.am index dd6d51661e..ecdace9771 100644 --- a/src/graphics/Makefile.am +++ b/src/graphics/Makefile.am @@ -1,13 +1,13 @@ AUTOMAKE_OPTIONS = foreign DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libgraphics.o +noinst_LTLIBRARIES = libgraphics.la LIBS = ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES) -libgraphics_o_SOURCES = \ +libgraphics_la_SOURCES = \ GraphicsCache.h \ GraphicsCache.C \ GraphicsCacheItem.h \ @@ -16,3 +16,8 @@ libgraphics_o_SOURCES = \ ImageLoaderXPM.C \ ImageLoader.h \ ImageLoader.C + +libgraphics.la: libgraphics.o + +libgraphics.o: $(libgraphics_la_OBJECTS) $(libgraphics_la_DEPENDENCIES) + $(CXXLINK) $(libgraphics_la_OBJECTS) diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am index a2599e0844..7fade3f830 100644 --- a/src/insets/Makefile.am +++ b/src/insets/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libinsets.o +noinst_LTLIBRARIES = libinsets.la LIBS = ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost @@ -15,7 +15,7 @@ EXTRA_DIST = \ insettheorem.C \ insettheorem.h -libinsets_o_SOURCES = \ +libinsets_la_SOURCES = \ ExternalTemplate.C \ ExternalTemplate.h \ figinset.C \ @@ -88,3 +88,8 @@ libinsets_o_SOURCES = \ # insetsection.C \ # insettheorem.C \ # insettheorem.h \ + +libinsets.la: libinsets.o + +libinsets.o: $(libinsets_la_OBJECTS) $(libinsets_la_DEPENDENCIES) + $(CXXLINK) $(libinsets_la_OBJECTS) diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index c72aaedc3a..2ece17bdb9 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -1,13 +1,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libmathed.o +noinst_LTLIBRARIES = libmathed.la LIBS= ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES) -libmathed_o_SOURCES = \ +libmathed_la_SOURCES = \ formulabase.C \ formulabase.h \ formula.C \ @@ -141,3 +141,8 @@ libmathed_o_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) diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 0a9458471a..7d5070b096 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libsupport.o +noinst_LTLIBRARIES = libsupport.la LIBS = ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost @@ -17,7 +17,7 @@ if USE_REGEX REGEX = regex.c lyxregex.h endif -libsupport_o_SOURCES = \ +libsupport_la_SOURCES = \ DebugStream.C \ DebugStream.h \ FileInfo.C \ @@ -72,3 +72,7 @@ libsupport_o_SOURCES = \ unlink.C \ utility.h +libsupport.la: libsupport.o + +libsupport.o: $(libsupport_la_OBJECTS) $(libsupport_la_DEPENDENCIES) + $(CXXLINK) $(libsupport_la_OBJECTS) -- 2.39.2