Reverted the reverted changes - 1.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d0c8447fed5564f5bb5fe7eb2b991a2a5f17181..4396a9b7a01fcfa6568e53e0aa76ae5c3327233a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
        graphics/libgraphics.la \
        frontends/libfrontends.la @FRONTEND_GUILIB@ \
        frontends/libfrontends.la \
+       frontends/controllers/libcontrollers.la \
        frontends/support/libfrontendsupport.la support/libsupport.la \
        @INCLUDED_SIGC@
 lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
@@ -22,7 +23,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 \
@@ -66,15 +66,17 @@ lyx_SOURCES = \
        Painter.h \
        PainterBase.C \
        PainterBase.h \
+       ParagraphParameters.C \
+       ParagraphParameters.h \
+       ParameterStruct.h \
        PrinterParams.h \
        Sectioning.h \
        Sectioning.C \
+       ShareContainer.h \
        Spacing.C \
        Spacing.h \
        TextCache.C \
        TextCache.h \
-       Timeout.C \
-       Timeout.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
        UpdateInset.C \
@@ -83,9 +85,6 @@ lyx_SOURCES = \
        Variables.h \
        WorkArea.C \
        WorkArea.h \
-       bibforms.h \
-       bmtable.c \
-       bmtable.h \
        broken_headers.h \
        buffer.C \
        buffer.h \
@@ -97,18 +96,12 @@ lyx_SOURCES = \
        bufferview_funcs.h \
        chset.C \
        chset.h \
-       combox.C \
-       combox.h \
        commandtags.h \
        config.h.in \
        converter.C \
        converter.h \
        counters.C \
        counters.h \
-       credits.C \
-       credits.h \
-       credits_form.C \
-       credits_form.h \
        debug.C \
        debug.h \
        encoding.C \
@@ -117,17 +110,16 @@ lyx_SOURCES = \
        exporter.h \
        ext_l10n.h \
        figure.h \
-       filedlg.C \
-       filedlg.h \
+       figure_form.C \
+       figure_form.h \
+       figureForm.C \
+       figureForm.h \
        font.C \
        font.h \
-       form1.C \
-       form1.h \
        gettext.C \
        gettext.h \
        importer.C \
        importer.h \
-       include_form.h \
        intl.C \
        intl.h \
        kbmap.C \
@@ -140,10 +132,6 @@ lyx_SOURCES = \
        lastfiles.h \
        layout.C \
        layout.h \
-       layout_forms.C \
-       layout_forms.h \
-       lyx.C \
-       lyx.h \
        lyx_cb.C \
        lyx_cb.h \
        lyx_gui.C \
@@ -158,10 +146,8 @@ lyx_SOURCES = \
        lyxcursor.h \
        lyxfont.C \
        lyxfont.h \
-       lyxfr0.C \
-       lyxfr0.h \
-       lyxfr1.C \
-       lyxfr1.h \
+       lyxfind.C \
+       lyxfind.h \
        lyxfunc.C \
        lyxfunc.h \
        lyxlex.C \
@@ -227,7 +213,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 commandtags.h
+       lyxserver.h layout.h gettext.h kbmap.h commandtags.h language.h
        $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \
          -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C