"Inter-word Space"

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 968ecaeb8e7ec75f2b25ac94343a1c1049b2d565..5d775d034279312d405714bee44c92284d0f2579 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,42 +4,40 @@ DISTCLEANFILES += config.h libintl.h
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
-SUBDIRS = mathed insets graphics support frontends
+SUBDIRS = mathed insets graphics support frontends tex2lyx
 
-LIBS += @LIBS@
+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_DEPENDENCIES = $(LYX_CONV_LIBS) $(INCLUDED_SIGC)
-
-lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) @INTLLIBS@ \
-       $(PSPELL_LIBS) @AIKSAURUS_LIBS@
-
-#lyx_LDADD = $(LYX_CONV_LIBS) $(SIGC_LIBS) $(BOOST_LIBS) $(INCLUDED_SIGC) @INTLLIBS@ \
-#      $(PSPELL_LIBS) @AIKSAURUS_LIBS@
+lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
+       $(AIKSAURUS_LIBS) @LIBS@
 
-#  @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+lyx_DEPENDENCIES = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
-       Sectioning.h \
-       Sectioning.C \
-       Variables.C \
-       Variables.h \
-       tracer.C \
-       tracer.h
-
-INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
-#INCLUDES = $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
+INCLUDES = $(BOOST_INCLUDES)
 
 localedir = $(datadir)/locale
 
@@ -48,7 +46,6 @@ BUILT_SOURCES = version.C
 lyx_SOURCES = \
        BufferView.C \
        BufferView.h \
-       BufferView2.C \
        BufferView_pimpl.C \
        BufferView_pimpl.h \
        Bullet.C \
@@ -74,15 +71,20 @@ lyx_SOURCES = \
        LaTeX.h \
        LaTeXFeatures.C \
        LaTeXFeatures.h \
+       latexrunparams.h \
        Lsstream.h \
        LyXAction.C \
        LyXAction.h \
        MenuBackend.C \
        MenuBackend.h \
+       paragraph_funcs.C \
+       paragraph_funcs.h \
+       ParagraphList.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
        ParameterStruct.h \
        PrinterParams.h \
+       RowList.h \
        ShareContainer.h \
        Spacing.C \
        Spacing.h \
@@ -90,9 +92,14 @@ lyx_SOURCES = \
        TextCache.h \
        Thesaurus.C \
        Thesaurus.h \
-       ToolbarDefaults.C \
-       ToolbarDefaults.h \
+       ToolbarBackend.C \
+       ToolbarBackend.h \
        WordLangTuple.h \
+       aspell.C \
+       aspell_local.h \
+       author.C \
+       author.h \
+       boost.C \
        box.h \
        box.C \
        broken_headers.h \
@@ -104,9 +111,11 @@ lyx_SOURCES = \
        bufferparams.h \
        bufferview_funcs.C \
        bufferview_funcs.h \
+       changes.C \
+       changes.h \
        chset.C \
        chset.h \
-       commandtags.h \
+       lfuns.h \
        config.h.in \
        converter.C \
        converter.h \
@@ -114,12 +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 \
@@ -166,6 +187,8 @@ lyx_SOURCES = \
        lyxrc.h \
        lyxrow.C \
        lyxrow.h \
+       lyxrow_funcs.C \
+       lyxrow_funcs.h \
        lyxserver.C \
        lyxserver.h \
        lyxtext.h \
@@ -176,6 +199,10 @@ lyx_SOURCES = \
        lyxvc.C \
        lyxvc.h \
        main.C \
+       messages.C \
+       messages.h \
+       metricsinfo.C \
+       metricsinfo.h \
        paragraph.C \
        paragraph.h \
        paragraph_pimpl.C \
@@ -185,11 +212,12 @@ lyx_SOURCES = \
        ispell.h \
        pspell.C \
        pspell.h \
+       rowpainter.C \
+       rowpainter.h \
        sgml.C \
        sgml.h \
        tabular.C \
        tabular.h \
-       tabular-old.C \
        tabular_funcs.C \
        tabular_funcs.h \
        tex-accent.C \
@@ -200,6 +228,9 @@ lyx_SOURCES = \
        texrow.h \
        text.C \
        text2.C \
+       text3.C \
+       text_funcs.C \
+       text_funcs.h \
        toc.C \
        toc.h \
        trans.C \
@@ -221,12 +252,12 @@ lyx_SOURCES = \
 lyx_main.o: lyx_main.C lyx_main.h config.h version.h \
        lyxrc.h support/path.h support/filetools.h \
        bufferlist.h debug.h support/FileInfo.h lastfiles.h intl.h \
-       lyxserver.h layout.h gettext.h kbmap.h commandtags.h language.h
+       lyxserver.h layout.h gettext.h kbmap.h lfuns.h language.h
        $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \
          -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C
 
-main.o: main.C config.h lyx_main.h gettext.h LString.h support/filetools.h support/os.h
-       $(CXXCOMPILE) -DLOCALEDIR=\"$(localedir)\" -c $(top_srcdir)/src/main.C
+messages.o: messages.C messages.h config.h LString.h support/filetools.h
+       $(CXXCOMPILE) -DLOCALEDIR=\"$(localedir)\" -c $(top_srcdir)/src/messages.C
 
 dist-hook:
        cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`