Fix for bug: #260 special rules if partially linking

[features.git] / src / Makefile.am

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