To make make install behave

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 950e4c79c95c5674c8754e5454b2f2fe16f85bb2..d5940914254f7a9291ea50cc83eb06ea63681f11 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,24 +6,21 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
 SUBDIRS = mathed insets graphics support frontends
 
+LIBS += @LIBS@
+
 bin_PROGRAMS = lyx
 
-if USE_LD_R
-LYX_CONV_LIBS = mathed/libmathed.o insets/libinsets.o \
-       frontends/libfrontends.o \
-       graphics/libgraphics.o \
-       support/libsupport.o
-else
 LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
        frontends/libfrontends.la \
        graphics/libgraphics.la \
        support/libsupport.la
-endif
 
 #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@
+       $(PSPELL_LIBS) @AIKSAURUS_LIBS@
+
+#  @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1
 
@@ -36,8 +33,11 @@ EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
        counters.h
 
 INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
+
 localedir = $(datadir)/locale
+
 BUILT_SOURCES = version.C
+
 lyx_SOURCES = \
        BufferView.C \
        BufferView.h \