don't rm emergency saves ever

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ba22e54778ca1befa50438033d1528cf280d4823..5b9d99363ad1ea5bed4bec876bd81e22920a68e3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,29 +6,35 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
 SUBDIRS = mathed insets graphics support frontends tex2lyx
 
+EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
+       Sectioning.h \
+       Sectioning.C \
+       Variables.C \
+       Variables.h \
+       tracer.C \
+       tracer.h
+
 bin_PROGRAMS = lyx
 
 LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
        frontends/libfrontends.la \
+       $(FRONTEND_GUILIB) \
+       frontends/controllers/libcontrollers.la \
        graphics/libgraphics.la \
        support/libsupport.la
 
+if USE_INCLUDED_BOOST
 BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
        ../boost/libs/signals/src/libboostsignals.la
+else
+BOOST_LIBS = -lboost_regex -lboost_signals
+endif
 
 lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
        $(AIKSAURUS_LIBS) @LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1
 
-EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
-       Sectioning.h \
-       Sectioning.C \
-       Variables.C \
-       Variables.h \
-       tracer.C \
-       tracer.h
-
 INCLUDES = $(BOOST_INCLUDES)
 
 localedir = $(datadir)/locale