anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simper dep. tracking and obj. file compile

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3579 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-02-20 22:04:47 +00:00
parent fae3fd8ab1
commit 28bba2b47b
6 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/ChangeLog
View File

@ -1,3 +1,7 @@
2002-02-20 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Makefile.am: better dep. tracking from controllers and xforms
2002-02-18 Angus Leeming <a.leeming@ic.ac.uk> 2002-02-18 Angus Leeming <a.leeming@ic.ac.uk>
* Liason.C: Changes due to the renaming of support/syscall.[Ch] as * Liason.C: Changes due to the renaming of support/syscall.[Ch] as

9
src/frontends/Makefile.am
View File

@ -11,13 +11,14 @@ INCLUDES = ${FRONTEND_INCLUDES} -I${srcdir}/.. -I${srcdir}/xforms ${SIGC_CFLAGS}
LIBS = LIBS =
noinst_LTLIBRARIES = libfrontends.o noinst_LTLIBRARIES = libfrontends.o
libfrontends_o_LIBADD= `cat libxforms.objects` \ libfrontends_o_LIBADD= \
`cat libcontrollers.objects` \ xforms/*.lo \
controllers/*.lo \
support/libfrontendsupport.o support/libfrontendsupport.o
libfrontends_o_DEPENDENCIES = \ libfrontends_o_DEPENDENCIES = \
libxforms.objects \ xforms/*.lo \
libcontrollers.objects \ controllers/*.lo \
support/libfrontendsupport.o support/libfrontendsupport.o
libfrontends_o_SOURCES=\ libfrontends_o_SOURCES=\

4
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,7 @@
2002-02-20 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Makefile.am: simpler obj. file compile
2002-02-18 Herbert Voss <voss@lyx.org> 2002-02-18 Herbert Voss <voss@lyx.org>
* ControlGraphics.[C]: remove help-file call * ControlGraphics.[C]: remove help-file call

15
src/frontends/controllers/Makefile.am
View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.4
DISTCLEANFILES= *.orig *.rej *~ *.bak core DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_LTLIBRARIES = libcontrollers.o noinst_LTLIBRARIES = libcontrollers.la
BOOST_INCLUDES = -I$(top_srcdir)/boost BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/src/ \ INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \ -I${top_srcdir}/src/frontends/ \
@ -11,7 +11,7 @@ ETAGS_ARGS = --lang=c++
EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl
libcontrollers_o_SOURCES=\ libcontrollers_la_SOURCES= \
biblio.C \ biblio.C \
biblio.h \ biblio.h \
character.C \ character.C \
@ -88,13 +88,4 @@ libcontrollers_o_SOURCES=\
helper_funcs.C \ helper_funcs.C \
helper_funcs.h helper_funcs.h
libcontrollers.o: $(libcontrollers_o_OBJECTS) $(libcontrollers_o_DEPENDENCIES) libcontrollers.la: $(libcontrollers_la_OBJECTS) $(libcontrollers_la_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

4
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,7 @@
2002-02-20 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Makefile.am: simpler obj. file compiling
2002-02-20 Juergen Vigna <jug@sad.it> 2002-02-20 Juergen Vigna <jug@sad.it>
* FormTabular.C (input): don't call the autoapply on exit input calls * FormTabular.C (input): don't call the autoapply on exit input calls

18
src/frontends/xforms/Makefile.am
View File

@ -1,18 +1,17 @@
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.4
DISTCLEANFILES= *.orig *.rej *~ *.bak core DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_LTLIBRARIES = libxforms.o noinst_LTLIBRARIES = libxforms.la
BOOST_INCLUDES = -I$(top_srcdir)/boost BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/images -I${top_srcdir}/src/ \ INCLUDES = -I${top_srcdir}/images -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \ -I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/controllers \ -I${top_srcdir}/src/frontends/controllers \
${SIGC_CFLAGS} $(BOOST_INCLUDES) ${SIGC_CFLAGS} $(BOOST_INCLUDES)
LIBS= LIBS=
LDFLAGS=
LYXDATADIRS = forms LYXDATADIRS = forms
ETAGS_ARGS = --lang=c++ ETAGS_ARGS = --lang=c++
# Alphabetical order please. It makes it easier to figure out what's missing. # Alphabetical order please. It makes it easier to figure out what's missing.
libxforms_o_SOURCES = \ libxforms_la_SOURCES = \
Alert_pimpl.C \ Alert_pimpl.C \
bmtable.c \ bmtable.c \
bmtable.h \ bmtable.h \
@ -205,18 +204,7 @@ libxforms_o_SOURCES = \
# GUI_runtime.C \ # GUI_runtime.C \
# GUI_applymenu.C # GUI_applymenu.C
libxforms_o_LIBADD = @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@ libxforms.la: $(libxforms_la_OBJECTS) $(libxforms_la_DEPENDENCIES)
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
# for convenience only # for convenience only
updatesrc: updatesrc: