Fix for bug: #260 special rules if partially linking

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

diff --git a/ChangeLog b/ChangeLog
index b4b8a860548c07a57ff08a5c6c471cfb461660d4..09e4ab90f27a48b676f426481eb5b76404d60c27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * configure.in: use LYX_CHECK_LDR 
+
 2002-03-14  Kayvan A. Sylvan  <kayvan@sylvan.com>
 
        * configure.in: Fix order of -lXpm and -lforms for

diff --git a/config/ChangeLog b/config/ChangeLog
index d75cab12343207114893387a0c855483cf013867..0350e2544d81fcca925b484efaf4c4a9bafb9ab0 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-20  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * lyxinclude.m4 (LYX_CHECK_LDR): function to test if we can use
+       partial linking or not.
+
 2002-03-18  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * common.am (DISTCLEANFILES): don't be recursive by default.

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 0da9cd4e826e5684fc94c246185d687f4666116d..b978e542847c366d329a2e1b86eeb53ae976fa74 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -1000,3 +1000,17 @@ AM_PROG_LIBTOOL dnl for libraries
 CC=$ac_save_cc
 CFLAGS="$ac_save_cflags"
 ])
+
+
+dnl bla bla 
+AC_DEFUN(LYX_CHECK_LDR,
+[
+AC_MSG_CHECKING(whether partial linking can be used)
+if test x$ac_cv_cygwin = xno -a x$lt_cv_prog_gnu_ld = xyes ; then
+    AM_CONDITIONAL(USE_LD_R, true)
+    AC_MSG_RESULT(yes)
+else
+    AM_CONDITIONAL(USE_LD_R, false)
+AC_MSG_RESULT(no)
+fi
+])

diff --git a/configure.in b/configure.in
index 88bf2ac91d4f6a61a079e04fa3b9313f6fc509ce..17ce6f87c00195c0704223194d91a0d2e3267f5c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -153,6 +153,7 @@ AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
 #AM_PROG_LIBTOOL
 LYX_PROG_LIBTOOL
+LYX_CHECK_LDR
 
 ### Check which libsigc++ we're using
 LYX_WITH_SIGC

diff --git a/src/ChangeLog b/src/ChangeLog
index 5be8e62f439019ca19503656d619f94cce89ae77..eccb38fc79c37316f44a5e2378ce2d74ffff2a12 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-20  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Makefile.am (LYX_CONV_LIBS): select libs depending on partial
+       linking or not.
+
 2002-03-19  Juergen Vigna  <jug@sad.it>
 
        * text2.C (clearSelection): reset also xsel_cache.

diff --git a/src/Makefile.am b/src/Makefile.am
index 060ce6970b7bb1879292ceeb7b65dd6c67cd8ccc..950e4c79c95c5674c8754e5454b2f2fe16f85bb2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,13 +8,21 @@ SUBDIRS = mathed insets graphics support frontends
 
 bin_PROGRAMS = lyx
 
-lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \
+if USE_LD_R
+LYX_CONV_LIBS = mathed/libmathed.o insets/libinsets.o \
        frontends/libfrontends.o \
        graphics/libgraphics.o \
-       support/libsupport.o \
-       @INCLUDED_SIGC@
+       support/libsupport.o
+else
+LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
+       frontends/libfrontends.la \
+       graphics/libgraphics.la \
+       support/libsupport.la
+endif
 
-lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
+#lyx_DEPENDENCIES = $(LYX_CONV_LIBS) $(INCLUDED_SIGC)
+
+lyx_LDADD = $(LYX_CONV_LIBS) $(SIGC_LIBS) $(INCLUDED_SIGC) @INTLLIBS@ \
        $(PSPELL_LIBS) @AIKSAURUS_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 5ec83aed73ed4c3d2aac7f480bc5bf9ec0af2dc6..a325a8d61117a07caad378dc0dd7480373392e02 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Makefile.am: special rules if partial linking
+
 2002-03-11  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * doxygen fixes.

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index 892ca2944a408d2bfc028b51c5b42b9078997ebe..1d0b1bdca45fd10a71178fe56608c1b6d0e5e879 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -29,10 +29,12 @@ libfrontends_la_SOURCES=\
        Toolbar.C \
        Toolbar.h
 
+if USE_LD_R
 libfrontends.la: libfrontends.o
 
 libfrontends.o: $(libfrontends_la_OBJECTS) $(libfrontends_la_DEPENDENCIES)
        $(CXXLINK) $(libfrontends_la_OBJECTS) $(libfrontends_la_LIBADD)
+endif
 
 EXTRA_DIST = xforms qt2 gnome
 

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 072fd2e914dad34931850160bd2a4d2ec3c7f7c2..109334bc828ee98b8d72eb20cb2ac28d685b33fc 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Makefile.am: special rules if partial linking
+
 2002-03-14  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * GraphicsCache.C: use Lars' preferred idiom for a for-loop.

diff --git a/src/graphics/Makefile.am b/src/graphics/Makefile.am
index 7ee6393d97e1a4a949623177962e65e69d674867..cd3664c45ecc6574057fb24d5f037eb7b893b4b0 100644 (file)
--- a/src/graphics/Makefile.am
+++ b/src/graphics/Makefile.am
@@ -23,7 +23,9 @@ libgraphics_la_SOURCES = \
        GraphicsParams.h \
        GraphicsTypes.h
 
+if USE_LD_R
 libgraphics.la: libgraphics.o
 
 libgraphics.o: $(libgraphics_la_OBJECTS) $(libgraphics_la_DEPENDENCIES)
        $(CXXLINK) $(libgraphics_la_OBJECTS)
+endif

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index f1cfae1f9bb72387fa36ed0dcbed1d07c3f6fa43..b306d002f9277bc0eede40cc9b5cc14a550af780 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Makefile.am: special rules if partial linking
+
 2002-03-19  Juergen Vigna  <jug@sad.it>
 
        * insetgraphics.C (draw): fixed the setting of CHANGED_IN_DRAW!

diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am
index 55649e2bd13c248c8b504d35457cc821191dadd0..8be2f8e0dc373d64b58b0363d72729695f93a49f 100644 (file)
--- a/src/insets/Makefile.am
+++ b/src/insets/Makefile.am
@@ -84,7 +84,9 @@ libinsets_la_SOURCES = \
 #      insettheorem.C \
 #      insettheorem.h \
 
+if USE_LD_R
 libinsets.la: libinsets.o
 
 libinsets.o: $(libinsets_la_OBJECTS) $(libinsets_la_DEPENDENCIES)
        $(CXXLINK) $(libinsets_la_OBJECTS)
+endif

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 6b5ef7f759aa94eb89cdd7125c7093f7131c3455..829f434b102f5141796dfbd13a9b7f90a3dc49c2 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Makefile.am: special rules if partial linking
+
 2002-03-18  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * math_charinset.C: wrap the std::strchr declaration inside a

diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am
index d5c8aa8df577d934f813a5292f8a9cd2ecd92289..9a4a478dda11539200d7c58b490cac158481ed56 100644 (file)
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -139,7 +139,9 @@ libmathed_la_SOURCES = \
        math_xymatrixinset.C \
        math_xymatrixinset.h
 
+if USE_LD_R
 libmathed.la: libmathed.o
 
 libmathed.o: $(libmathed_la_OBJECTS) $(libmathed_la_DEPENDENCIES)
        $(CXXLINK) $(libmathed_la_OBJECTS)
+endif

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 63350324add19ec16d549fee3e188321ed7c86dd..622c05503c9b400b2b6a14b734b056ab38eafc9e 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Makefile.am (libsupport.la): special rules if partial linking
+
 2002-03-14  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * forkedcontr.C: turn the timer off when their are no longer any

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 1536c2911c91d8b7a8a24bb53ffb2c7855511571..2d910d7829d62f94ac0b2057ba19720be08b4313 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -76,7 +76,9 @@ libsupport_la_SOURCES = \
        unlink.C \
        utility.h
 
+if USE_LD_R
 libsupport.la: libsupport.o
 
 libsupport.o: $(libsupport_la_OBJECTS) $(libsupport_la_DEPENDENCIES)
        $(CXXLINK) $(libsupport_la_OBJECTS)
+endif