iSome makefiles tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@308 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 1999-11-10 15:09:42 +00:00
parent f1bc028820
commit 704d1475fc
4 changed files with 11 additions and 3 deletions

View File

@ -1,5 +1,13 @@
1999-11-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 1999-11-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/{mathed,insets}/Makefile.am (CXXLINK): add $(LDFLAGS) to the
link line, so that Irix users (for example) can set it explicitely to
"-n32".
* src/Makefile.am (lyx_LDADD): use LYX_LIB as a variable, so that
it can be overidden at make time (static or dynamic link, for
example).
* src/vc-backend.C, src/LaTeXFeatures.h, * src/vc-backend.C, src/LaTeXFeatures.h,
src/support/LRegex.C, src/support/LRegex.h: add a few "using" src/support/LRegex.C, src/support/LRegex.h: add a few "using"
statements to bring templates to global namespace. statements to bring templates to global namespace.

View File

@ -4,7 +4,7 @@ DISTCLEANFILES = libintl.h config.h
MAINTAINERCLEANFILES = Makefile.in config.h.in MAINTAINERCLEANFILES = Makefile.in config.h.in
bin_PROGRAMS = lyx bin_PROGRAMS = lyx
lyx_LDADD = mathed/mathed.o insets/insets.o support/libsupport.a \ lyx_LDADD = mathed/mathed.o insets/insets.o support/libsupport.a \
@INTLLIBS@ @LYX_LIBS@ @INTLLIBS@ $(LYX_LIBS)
lyx_DEPENDENCIES = mathed insets support/libsupport.a lyx_DEPENDENCIES = mathed insets support/libsupport.a
EXTRA_DIST = config.h.in stamp-h.in cheaders EXTRA_DIST = config.h.in stamp-h.in cheaders
ETAGS_ARGS = --c++ ETAGS_ARGS = --c++

View File

@ -5,7 +5,7 @@ LIBS=
LDFLAGS= LDFLAGS=
ETAGS_ARGS = --c++ ETAGS_ARGS = --c++
INCLUDES = -I${srcdir}/../ INCLUDES = -I${srcdir}/../
CXXLINK = $(LD) -r -o $(noinst_PROGRAMS) CXXLINK = $(LD) $(LDFLAGS)-r -o $(noinst_PROGRAMS)
insets_o_SOURCES = \ insets_o_SOURCES = \
figinset.C \ figinset.C \

View File

@ -5,7 +5,7 @@ LIBS=
LDFLAGS= LDFLAGS=
ETAGS_ARGS = --c++ ETAGS_ARGS = --c++
INCLUDES = -I${top_srcdir}/images -I${srcdir}/../ INCLUDES = -I${top_srcdir}/images -I${srcdir}/../
CXXLINK = $(LD) -r -o $(noinst_PROGRAMS) CXXLINK = $(LD) $(LDFLAGS) -r -o $(noinst_PROGRAMS)
mathed_o_SOURCES = array.h \ mathed_o_SOURCES = array.h \
formula.C \ formula.C \