Ok, this is work in progress. I'd like those of you having problems
with ld -r on cygwin to try this. (Kayvan!)
I also need some help to finish the LYX_CHECK_LDR function...
(Jean-Marc?)
autogen and a configure is needed.
? build
? confdefs.h
Index: configure.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.in,v
retrieving revision 1.100
diff -u -p -r1.100 configure.in
--- configure.in 15 Mar 2002 16:14:15 -0000 1.100
+++ configure.in 18 Mar 2002 23:19:13 -0000
@@ -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
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.55
diff -u -p -r1.55 lyxinclude.m4
--- config/lyxinclude.m4 15 Mar 2002 11:23:15 -0000 1.55
+++ config/lyxinclude.m4 18 Mar 2002 23:19:14 -0000
@@ -1000,3 +1000,10 @@ AM_PROG_LIBTOOL dnl for libraries
CC=$ac_save_cc
CFLAGS="$ac_save_cflags"
])
+
+
+dnl bla bla
+AC_DEFUN(LYX_CHECK_LDR,
+[
+ AM_CONDITIONAL(USE_LD_R, false);
+])
Index: src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile.am
--- src/Makefile.am 15 Mar 2002 16:14:15 -0000 1.115
+++ src/Makefile.am 18 Mar 2002 23:19:14 -0000
@@ -8,10 +8,19 @@ SUBDIRS = mathed insets graphics support
bin_PROGRAMS = lyx
-lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \
- frontends/libfrontends.o \
+if USE_LD_R
+LYX_CONV_LIBS = mathed/libmathed.o insets/libinsets.o \
+ frontend/libfrontends.o \
graphics/libgraphics.o \
- support/libsupport.o \
+ support/libsupport.o
+else
+LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
+ frontend/libfrontends.la \
+ graphics/libgraphics.la \
+ support/libsupport.la
+endif
+
+lyx_DEPENDENCIES = $(LYX_CONV_LIBS) \
@INCLUDED_SIGC@
lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
Index: src/frontends/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- src/frontends/Makefile.am 13 Mar 2002 18:24:43 -0000 1.27
+++ src/frontends/Makefile.am 18 Mar 2002 23:19:14 -0000
@@ -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
Index: src/graphics/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/Makefile.am,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.am
--- src/graphics/Makefile.am 13 Mar 2002 18:24:44 -0000 1.12
+++ src/graphics/Makefile.am 18 Mar 2002 23:19:15 -0000
@@ -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
Index: src/insets/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/Makefile.am,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile.am
--- src/insets/Makefile.am 13 Mar 2002 18:24:44 -0000 1.43
+++ src/insets/Makefile.am 18 Mar 2002 23:19:15 -0000
@@ -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
Index: src/mathed/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/Makefile.am,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile.am
--- src/mathed/Makefile.am 18 Mar 2002 11:45:53 -0000 1.83
+++ src/mathed/Makefile.am 18 Mar 2002 23:19:15 -0000
@@ -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
Index: src/support/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/Makefile.am,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile.am
--- src/support/Makefile.am 13 Mar 2002 18:24:44 -0000 1.41
+++ src/support/Makefile.am 18 Mar 2002 23:19:15 -0000
@@ -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
--
Lgb
