Fix the WorkArea problems.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 4cc29ddc21d62f577f41d0bc3df6e00c4f457310..33c8d01a3013409e6dce18dac0a625ad8a7bbef7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,19 +3,17 @@ SUBDIRS = mathed insets graphics support frontends
 DISTCLEANFILES= *.orig *.rej *~ *.bak core libintl.h config.h
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/config.h.in
 bin_PROGRAMS = lyx
-## libfrontends is given twice on the link line because it needs stuff
-## from FRONTEND_GUILIB and inversely. If you do not like it, feel
-## free to provide another solution... Maybe signals would solve that
-## magically, but I do not understand them much (JMarc)
+
 lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
        graphics/libgraphics.la \
        frontends/libfrontends.la \
        support/libsupport.la \
        @INCLUDED_SIGC@
-lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
-       $(PSPELL_LIBS) @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
+       $(PSPELL_LIBS) @AIKSAURUS_LIBS@
+
 #lyx_LDFLAGS=-Wl,-O1
-EXTRA_DIST = config.h.in stamp-h.in cheaders
+EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version_info.h.in
 ETAGS_ARGS = --lang=c++
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
@@ -75,6 +73,8 @@ lyx_SOURCES = \
        Spacing.h \
        TextCache.C \
        TextCache.h \
+       Thesaurus.C \
+       Thesaurus.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
        UpdateInset.C \
@@ -83,6 +83,8 @@ lyx_SOURCES = \
        Variables.h \
        WorkArea.C \
        WorkArea.h \
+       XFormsView.C \
+       XFormsView.h \
        broken_headers.h \
        buffer.C \
        buffer.h \
@@ -106,7 +108,6 @@ lyx_SOURCES = \
        encoding.h \
        exporter.C \
        exporter.h \
-       ext_l10n.h \
        figure.h \
        figure_form.C \
        figure_form.h \
@@ -114,12 +115,15 @@ lyx_SOURCES = \
        figureForm.h \
        font.C \
        font.h \
+       func_status.h \
        gettext.C \
        gettext.h \
        importer.C \
        importer.h \
        intl.C \
        intl.h \
+       iterators.C \
+       iterators.h \
        kbmap.C \
        kbmap.h \
        kbsequence.C \
@@ -177,10 +181,10 @@ lyx_SOURCES = \
        print_form.C \
        print_form.h \
        screen.C \
-       sp_form.C \
-       sp_form.h \
-       spellchecker.C \
-       spellchecker.h \
+       sp_base.h \
+       sp_spell.C \
+       sp_ispell.h \
+       sp_pspell.h \
        stl_string_fwd.h \
        tabular.C \
        tabular.h \
@@ -202,11 +206,14 @@ lyx_SOURCES = \
        trans_mgr.h \
        undo.C \
        undo.h \
+       undo_funcs.C \
+       undo_funcs.h \
        undostack.C \
        undostack.h \
        vc-backend.C \
        vc-backend.h \
        version.h \
+       version_info.h.in \
        vms_defines.h \
        vspace.C \
        vspace.h
@@ -214,11 +221,13 @@ 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 language.h
+       lyxserver.h layout.h gettext.h kbmap.h commandtags.h language.h \
+       version_info.h.in
        $(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
+main.o: main.C config.h lyx_main.h gettext.h LString.h support/filetools.h \
+       support/os.h frontends/GUIRunTime.h
        $(CXXCOMPILE) -DLOCALEDIR=\"$(localedir)\" -c $(top_srcdir)/src/main.C
 
 dist-hook: