iSome makefiles tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@308 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 0e073a51a795c4f943a5004d194919f1ccee763d..f9d8153506e497368b946d678acbe0e9d29ff1f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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/support/LRegex.C, src/support/LRegex.h: add a few "using" 
        statements to bring templates to global namespace.

diff --git a/src/Makefile.am b/src/Makefile.am
index 648140c42d9dab65e97fbeb9d2adc496736ec8ef..b3844c4474ba2d94665e7d4ae5fa9b2e62ac959d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ DISTCLEANFILES = libintl.h config.h
 MAINTAINERCLEANFILES = Makefile.in config.h.in
 bin_PROGRAMS = lyx
 lyx_LDADD = mathed/mathed.o insets/insets.o support/libsupport.a \
-       @INTLLIBS@ @LYX_LIBS@
+       @INTLLIBS@ $(LYX_LIBS)
 lyx_DEPENDENCIES = mathed insets support/libsupport.a
 EXTRA_DIST = config.h.in stamp-h.in cheaders
 ETAGS_ARGS = --c++

diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am
index 7426f05bf75bfbd5e383ef2b4e58e191ab5de18d..6bd454fcfddef0ca32a309909a8a01440389b6f5 100644 (file)
--- a/src/insets/Makefile.am
+++ b/src/insets/Makefile.am
@@ -5,7 +5,7 @@ LIBS=
 LDFLAGS=
 ETAGS_ARGS = --c++
 INCLUDES = -I${srcdir}/../ 
-CXXLINK = $(LD) -r -o $(noinst_PROGRAMS)
+CXXLINK = $(LD) $(LDFLAGS)-r -o $(noinst_PROGRAMS)
 
 insets_o_SOURCES = \
        figinset.C \

diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am
index 534637c67f1445aa67ba806c315e78a6b6f45529..f6c1483f5f33ef8731bec2f7b8464139a1ceb444 100644 (file)
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -5,7 +5,7 @@ LIBS=
 LDFLAGS=
 ETAGS_ARGS = --c++
 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 \
        formula.C \