fix some C++ parsing bugs

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b899d9d1899b1cd41086c4e7d95b5fc5320f1b6f..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
 
@@ -19,7 +17,7 @@ BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
        ../boost/libs/signals/src/libboostsignals.la
 
 lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
-       $(PSPELL_LIBS) $(AIKSAURUS_LIBS)
+       $(AIKSAURUS_LIBS) @LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1
 
@@ -31,7 +29,7 @@ EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
        tracer.C \
        tracer.h
 
-INCLUDES = $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
+INCLUDES = $(BOOST_INCLUDES)
 
 localedir = $(datadir)/locale
 
@@ -79,6 +77,8 @@ lyx_SOURCES = \
        ParagraphParameters.h \
        ParameterStruct.h \
        PrinterParams.h \
+       RowList.C \
+       RowList.h \
        ShareContainer.h \
        Spacing.C \
        Spacing.h \
@@ -89,6 +89,10 @@ lyx_SOURCES = \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
        WordLangTuple.h \
+       aspell.C \
+       aspell_local.h \
+       author.C \
+       author.h \
        boost.C \
        boost-inst.C \
        box.h \
@@ -102,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 \
@@ -178,6 +184,8 @@ lyx_SOURCES = \
        lyxvc.C \
        lyxvc.h \
        main.C \
+       metricsinfo.C \
+       metricsinfo.h \
        paragraph.C \
        paragraph.h \
        paragraph_pimpl.C \
@@ -187,6 +195,8 @@ lyx_SOURCES = \
        ispell.h \
        pspell.C \
        pspell.h \
+       rowpainter.C \
+       rowpainter.h \
        sgml.C \
        sgml.h \
        tabular.C \
@@ -219,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