small cleanups, mostly from John

[features.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0623dc00f9c9a756b18458529ef6beed510448ab..bd153c01fd41053fc97e17d8cd225537c8730582 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,17 +9,18 @@ bin_PROGRAMS = lyx
 ## magically, but I do not understand them much (JMarc)
 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 \
+       support/libsupport.la \
+       @INCLUDED_SIGC@
 lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
        $(PSPELL_LIBS) @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 #lyx_LDFLAGS=-Wl,-O1
 EXTRA_DIST = config.h.in stamp-h.in cheaders
 ETAGS_ARGS = --lang=c++
-INCLUDES = $(SIGC_CFLAGS) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
+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 \
@@ -37,15 +38,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 \
@@ -53,9 +51,7 @@ lyx_SOURCES = \
        LaTeX.h \
        LaTeXFeatures.C \
        LaTeXFeatures.h \
-       LaTeXLog.C \
-       Literate.C \
-       Literate.h \
+       Lsstream.h \
        LyXAction.C \
        LyXAction.h \
        LyXSendto.C \
@@ -68,18 +64,17 @@ lyx_SOURCES = \
        Painter.h \
        PainterBase.C \
        PainterBase.h \
-       PaperLayout.C \
-       ParagraphExtra.C \
+       ParagraphParameters.C \
+       ParagraphParameters.h \
+       ParameterStruct.h \
        PrinterParams.h \
        Sectioning.h \
        Sectioning.C \
+       ShareContainer.h \
        Spacing.C \
        Spacing.h \
-       TableLayout.C \
        TextCache.C \
        TextCache.h \
-       Timeout.C \
-       Timeout.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
        UpdateInset.C \
@@ -88,9 +83,6 @@ lyx_SOURCES = \
        Variables.h \
        WorkArea.C \
        WorkArea.h \
-       bibforms.h \
-       bmtable.c \
-       bmtable.h \
        broken_headers.h \
        buffer.C \
        buffer.h \
@@ -100,23 +92,14 @@ lyx_SOURCES = \
        bufferparams.h \
        bufferview_funcs.C \
        bufferview_funcs.h \
-       bullet_forms.C \
-       bullet_forms.h \
-       bullet_forms_cb.C \
        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 \
@@ -125,14 +108,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 \
-       include_form.h \
+       importer.C \
+       importer.h \
        intl.C \
        intl.h \
        kbmap.C \
@@ -145,12 +130,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 \
        lyx_cb.h \
        lyx_gui.C \
@@ -159,19 +138,14 @@ 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 \
        lyxcursor.h \
        lyxfont.C \
        lyxfont.h \
-       lyxfr0.C \
-       lyxfr0.h \
-       lyxfr1.C \
-       lyxfr1.h \
+       lyxfind.C \
+       lyxfind.h \
        lyxfunc.C \
        lyxfunc.h \
        lyxlex.C \
@@ -192,8 +166,6 @@ lyx_SOURCES = \
        lyxvc.C \
        lyxvc.h \
        main.C \
-       menus.C \
-       menus.h \
        minibuffer.C \
        minibuffer.h \
        nt_defines.h \
@@ -208,13 +180,11 @@ lyx_SOURCES = \
        spellchecker.C \
        spellchecker.h \
        stl_string_fwd.h \
-       table.C \
-       table.h \
        tabular.C \
        tabular.h \
+       tabular-old.C \
        tex-accent.C \
        tex-accent.h \
-       tex-defs.h \
        tex-strings.C \
        tex-strings.h \
        texrow.C \
@@ -240,7 +210,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 language.h
        $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \
          -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C