From 28bba2b47b6cd03dad0813e9c8a27c8575eb0e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 20 Feb 2002 22:04:47 +0000 Subject: [PATCH] simper dep. tracking and obj. file compile git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3579 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/ChangeLog | 4 ++++ src/frontends/Makefile.am | 9 +++++---- src/frontends/controllers/ChangeLog | 4 ++++ src/frontends/controllers/Makefile.am | 15 +++------------ src/frontends/xforms/ChangeLog | 4 ++++ src/frontends/xforms/Makefile.am | 18 +++--------------- 6 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 8247781a87..d5e6cdf214 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,7 @@ +2002-02-20 Lars Gullik Bjønnes + + * Makefile.am: better dep. tracking from controllers and xforms + 2002-02-18 Angus Leeming * Liason.C: Changes due to the renaming of support/syscall.[Ch] as diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index a1b314f165..2c155a9ea9 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -11,13 +11,14 @@ INCLUDES = ${FRONTEND_INCLUDES} -I${srcdir}/.. -I${srcdir}/xforms ${SIGC_CFLAGS} LIBS = noinst_LTLIBRARIES = libfrontends.o -libfrontends_o_LIBADD= `cat libxforms.objects` \ - `cat libcontrollers.objects` \ +libfrontends_o_LIBADD= \ + xforms/*.lo \ + controllers/*.lo \ support/libfrontendsupport.o libfrontends_o_DEPENDENCIES = \ - libxforms.objects \ - libcontrollers.objects \ + xforms/*.lo \ + controllers/*.lo \ support/libfrontendsupport.o libfrontends_o_SOURCES=\ diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 54b0de5e8c..ff2756a20f 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,7 @@ +2002-02-20 Lars Gullik Bjønnes + + * Makefile.am: simpler obj. file compile + 2002-02-18 Herbert Voss * ControlGraphics.[C]: remove help-file call diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am index 50feeaad66..751261dd89 100644 --- a/src/frontends/controllers/Makefile.am +++ b/src/frontends/controllers/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libcontrollers.o +noinst_LTLIBRARIES = libcontrollers.la BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I${top_srcdir}/src/ \ -I${top_srcdir}/src/frontends/ \ @@ -11,7 +11,7 @@ ETAGS_ARGS = --lang=c++ EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl -libcontrollers_o_SOURCES=\ +libcontrollers_la_SOURCES= \ biblio.C \ biblio.h \ character.C \ @@ -88,13 +88,4 @@ libcontrollers_o_SOURCES=\ helper_funcs.C \ helper_funcs.h -libcontrollers.o: $(libcontrollers_o_OBJECTS) $(libcontrollers_o_DEPENDENCIES) - rm -f ../libcontrollers.objects.new - for fil in $(libcontrollers_o_OBJECTS) ; do \ - echo controllers/$$fil >> ../libcontrollers.objects.new ; \ - done - if [ -f ../libcontrollers.objects ] ; then \ - cmp -s ../libcontrollers.objects ../libcontrollers.objects.new || mv ../libcontrollers.objects.new ../libcontrollers.objects ; \ - else \ - mv ../libcontrollers.objects.new ../libcontrollers.objects ; \ - fi +libcontrollers.la: $(libcontrollers_la_OBJECTS) $(libcontrollers_la_DEPENDENCIES) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 18ea844eff..9defce8992 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2002-02-20 Lars Gullik Bjønnes + + * Makefile.am: simpler obj. file compiling + 2002-02-20 Juergen Vigna * FormTabular.C (input): don't call the autoapply on exit input calls diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index 9f3e3739b1..fe12572547 100644 --- a/src/frontends/xforms/Makefile.am +++ b/src/frontends/xforms/Makefile.am @@ -1,18 +1,17 @@ AUTOMAKE_OPTIONS = foreign 1.4 DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libxforms.o +noinst_LTLIBRARIES = libxforms.la BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I${top_srcdir}/images -I${top_srcdir}/src/ \ -I${top_srcdir}/src/frontends/ \ -I${top_srcdir}/src/frontends/controllers \ ${SIGC_CFLAGS} $(BOOST_INCLUDES) LIBS= -LDFLAGS= LYXDATADIRS = forms ETAGS_ARGS = --lang=c++ # Alphabetical order please. It makes it easier to figure out what's missing. -libxforms_o_SOURCES = \ +libxforms_la_SOURCES = \ Alert_pimpl.C \ bmtable.c \ bmtable.h \ @@ -205,18 +204,7 @@ libxforms_o_SOURCES = \ # GUI_runtime.C \ # GUI_applymenu.C -libxforms_o_LIBADD = @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@ - -libxforms.o: $(libxforms_o_OBJECTS) $(libxforms_o_DEPENDENCIES) - rm -f ../libxforms.objects.new - for fil in $(libxforms_o_OBJECTS) ; do \ - echo xforms/$$fil >> ../libxforms.objects.new ; \ - done - if [ -f ../libxforms.objects ] ; then \ - cmp -s ../libxforms.objects ../libxforms.objects.new || mv ../libxforms.objects.new ../libxforms.objects ; \ - else \ - mv ../libxforms.objects.new ../libxforms.objects ; \ - fi +libxforms.la: $(libxforms_la_OBJECTS) $(libxforms_la_DEPENDENCIES) # for convenience only updatesrc: