"Inter-word Space"

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ba22e54778ca1befa50438033d1528cf280d4823..5d775d034279312d405714bee44c92284d0f2579 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,28 +6,36 @@ 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
+lyx_DEPENDENCIES = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS)
 
-EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
-       Sectioning.h \
-       Sectioning.C \
-       Variables.C \
-       Variables.h \
-       tracer.C \
-       tracer.h
+#lyx_LDFLAGS=-Wl,-O1
 
 INCLUDES = $(BOOST_INCLUDES)
 
@@ -63,6 +71,7 @@ lyx_SOURCES = \
        LaTeX.h \
        LaTeXFeatures.C \
        LaTeXFeatures.h \
+       latexrunparams.h \
        Lsstream.h \
        LyXAction.C \
        LyXAction.h \
@@ -70,7 +79,6 @@ lyx_SOURCES = \
        MenuBackend.h \
        paragraph_funcs.C \
        paragraph_funcs.h \
-       ParagraphList.C \
        ParagraphList.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
@@ -115,16 +123,24 @@ lyx_SOURCES = \
        counters.h \
        debug.C \
        debug.h \
+       dimension.C \
+       dimension.h \
        encoding.C \
        encoding.h \
+       errorlist.C \
+       errorlist.h \
        exporter.C \
        exporter.h \
        gettext.C \
        gettext.h \
        factory.h \
        factory.C \
+       format.C \
+       format.h \
        funcrequest.h \
        funcrequest.C \
+       graph.C \
+       graph.h \
        importer.C \
        importer.h \
        intl.C \
@@ -231,11 +247,7 @@ lyx_SOURCES = \
        version.C \
        version.h \
        vspace.C \
-       vspace.h \
-       graph.C \
-       graph.h \
-       format.C \
-       format.h
+       vspace.h
 
 lyx_main.o: lyx_main.C lyx_main.h config.h version.h \
        lyxrc.h support/path.h support/filetools.h \