character2.diff.gz

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 49537854e7fbe0832fa6eedfad209ec0a7f8be0f..89bfd7189cc0a9489332926681065189afba2d65 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,9 @@ bin_PROGRAMS = lyx
 lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
        graphics/libgraphics.la \
        frontends/libfrontends.la @FRONTEND_GUILIB@ \
-       frontends/libfrontends.la support/libsupport.la @INCLUDED_SIGC@
+       frontends/libfrontends.la \
+       frontends/support/libfrontendsupport.la support/libsupport.la \
+       @INCLUDED_SIGC@
 lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
        $(PSPELL_LIBS) @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 #lyx_LDFLAGS=-Wl,-O1
@@ -20,7 +22,6 @@ BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
 localedir = $(datadir)/locale
 lyx_SOURCES = \
-       BackStack.h \
        BufferView.C \
        BufferView.h \
        BufferView2.C \
@@ -38,15 +39,12 @@ lyx_SOURCES = \
        DepTable.h \
        FloatList.C \
        FloatList.h \
+       Floating.C \
        Floating.h \
        FontInfo.C \
        FontInfo.h \
        FontLoader.C \
        FontLoader.h \
-       ImportLaTeX.C \
-       ImportLaTeX.h \
-       ImportNoweb.C \
-       ImportNoweb.h \
        LColor.C \
        LColor.h \
        LString.h \
@@ -54,9 +52,6 @@ lyx_SOURCES = \
        LaTeX.h \
        LaTeXFeatures.C \
        LaTeXFeatures.h \
-       LaTeXLog.C \
-       Literate.C \
-       Literate.h \
        Lsstream.h \
        LyXAction.C \
        LyXAction.h \
@@ -77,8 +72,6 @@ lyx_SOURCES = \
        Spacing.h \
        TextCache.C \
        TextCache.h \
-       Timeout.C \
-       Timeout.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
        UpdateInset.C \
@@ -87,7 +80,6 @@ lyx_SOURCES = \
        Variables.h \
        WorkArea.C \
        WorkArea.h \
-       bibforms.h \
        bmtable.c \
        bmtable.h \
        broken_headers.h \
@@ -127,7 +119,10 @@ lyx_SOURCES = \
        font.h \
        form1.C \
        form1.h \
+       gettext.C \
        gettext.h \
+       importer.C \
+       importer.h \
        include_form.h \
        intl.C \
        intl.h \
@@ -141,10 +136,6 @@ lyx_SOURCES = \
        lastfiles.h \
        layout.C \
        layout.h \
-       layout_forms.C \
-       layout_forms.h \
-       log_form.C \
-       log_form.h \
        lyx.C \
        lyx.h \
        lyx_cb.C \
@@ -155,9 +146,6 @@ lyx_SOURCES = \
        lyx_gui_misc.h \
        lyx_main.C \
        lyx_main.h \
-       lyx_sendfax.C \
-       lyx_sendfax.h \
-       lyx_sendfax_main.C \
        lyx_sty.C \
        lyx_sty.h \
        lyxcursor.C \
@@ -204,6 +192,7 @@ lyx_SOURCES = \
        stl_string_fwd.h \
        tabular.C \
        tabular.h \
+       tabular-old.C \
        tex-accent.C \
        tex-accent.h \
        tex-defs.h \
@@ -232,7 +221,7 @@ lyx_SOURCES = \
 lyx_main.o: lyx_main.C lyx_main.h config.h version.h lyx_gui.h \
        lyx_gui_misc.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 
+       lyxserver.h layout.h gettext.h kbmap.h commandtags.h
        $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \
          -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C