fix some C++ parsing bugs

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index bab0cec8acd386443c1f0906943e46d1d737ef39..7b5a9b53a1a3a6e499a8f13a7aeee7fc13a7f9cb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,9 +4,7 @@ DISTCLEANFILES += config.h libintl.h
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
-SUBDIRS = mathed insets graphics support frontends
-
-LIBS += @LIBS@
+SUBDIRS = mathed insets graphics support frontends tex2lyx
 
 bin_PROGRAMS = lyx
 
@@ -18,19 +16,12 @@ LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
 BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
        ../boost/libs/signals/src/libboostsignals.la
 
-#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@
-
-#  @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
+       $(AIKSAURUS_LIBS) @LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1
 
-EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
+EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
        Sectioning.h \
        Sectioning.C \
        Variables.C \
@@ -38,17 +29,16 @@ EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
        tracer.C \
        tracer.h
 
-INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
-#INCLUDES = $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
+INCLUDES = $(BOOST_INCLUDES)
 
 localedir = $(datadir)/locale
 
 BUILT_SOURCES = version.C
 
 lyx_SOURCES = \
+       BoostFormat.h \
        BufferView.C \
        BufferView.h \
-       BufferView2.C \
        BufferView_pimpl.C \
        BufferView_pimpl.h \
        Bullet.C \
@@ -79,10 +69,16 @@ lyx_SOURCES = \
        LyXAction.h \
        MenuBackend.C \
        MenuBackend.h \
+       paragraph_funcs.C \
+       paragraph_funcs.h \
+       ParagraphList.C \
+       ParagraphList.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
        ParameterStruct.h \
        PrinterParams.h \
+       RowList.C \
+       RowList.h \
        ShareContainer.h \
        Spacing.C \
        Spacing.h \
@@ -92,6 +88,13 @@ lyx_SOURCES = \
        Thesaurus.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
+       WordLangTuple.h \
+       aspell.C \
+       aspell_local.h \
+       author.C \
+       author.h \
+       boost.C \
+       boost-inst.C \
        box.h \
        box.C \
        broken_headers.h \
@@ -103,9 +106,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 \
@@ -119,6 +124,10 @@ lyx_SOURCES = \
        exporter.h \
        gettext.C \
        gettext.h \
+       factory.h \
+       factory.C \
+       funcrequest.h \
+       funcrequest.C \
        importer.C \
        importer.h \
        intl.C \
@@ -175,6 +184,8 @@ lyx_SOURCES = \
        lyxvc.C \
        lyxvc.h \
        main.C \
+       metricsinfo.C \
+       metricsinfo.h \
        paragraph.C \
        paragraph.h \
        paragraph_pimpl.C \
@@ -184,6 +195,8 @@ lyx_SOURCES = \
        ispell.h \
        pspell.C \
        pspell.h \
+       rowpainter.C \
+       rowpainter.h \
        sgml.C \
        sgml.h \
        tabular.C \
@@ -199,6 +212,7 @@ lyx_SOURCES = \
        texrow.h \
        text.C \
        text2.C \
+       text3.C \
        toc.C \
        toc.h \
        trans.C \
@@ -215,12 +229,16 @@ lyx_SOURCES = \
        version.C \
        version.h \
        vspace.C \
-       vspace.h
+       vspace.h \
+       graph.C \
+       graph.h \
+       format.C \
+       format.h
 
 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