small changes to ButtonController usage

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b04ce5912b01d6801bb8dc29036e00fddcbd0179..db30fb92710cc9148a03cacc6cb3af6bb7feca01 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,25 +1,43 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = mathed insets support
-DISTCLEANFILES = libintl.h config.h
-MAINTAINERCLEANFILES = Makefile.in config.h.in
+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
-lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la support/libsupport.la
-lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS)
+## 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 @FRONTEND_GUILIB@ \
+       frontends/libfrontends.la support/libsupport.la @INCLUDED_SIGC@
+lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
+       @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+#lyx_LDFLAGS=-Wl,-O1
 EXTRA_DIST = config.h.in stamp-h.in cheaders
-ETAGS_ARGS = --c++
-INCLUDES = -I${top_srcdir}/images
+ETAGS_ARGS = --lang=c++
+INCLUDES = $(SIGC_CFLAGS) @FRONTEND_INCLUDES@
 localedir = $(datadir)/locale
 lyx_SOURCES = \
        BackStack.h \
        BufferView.C \
        BufferView.h \
        BufferView2.C \
+       BufferView_pimpl.C \
+       BufferView_pimpl.h \
        Bullet.C \
        Bullet.h \
        Chktex.C \
        Chktex.h \
+       ColorHandler.C \
+       ColorHandler.h \
+       CutAndPaste.C \
+       CutAndPaste.h \
        DepTable.C \
        DepTable.h \
+       FloatList.C \
+       FloatList.h \
+       Floating.h \
        FontInfo.C \
        FontInfo.h \
        FontLoader.C \
@@ -44,21 +62,30 @@ lyx_SOURCES = \
        LyXView.C \
        LyXView.h \
        Makefile.in \
+       MenuBackend.C \
+       MenuBackend.h \
        Painter.C \
        Painter.h \
        PainterBase.C \
        PainterBase.h \
        PaperLayout.C \
        ParagraphExtra.C \
+       PrinterParams.h \
+       Sectioning.h \
+       Sectioning.C \
        Spacing.C \
        Spacing.h \
        TableLayout.C \
        TextCache.C \
        TextCache.h \
+       Timeout.C \
+       Timeout.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
        UpdateInset.C \
        UpdateInset.h \
+       Variables.C \
+       Variables.h \
        WorkArea.C \
        WorkArea.h \
        bibforms.h \
@@ -71,6 +98,8 @@ lyx_SOURCES = \
        bufferlist.h \
        bufferparams.C \
        bufferparams.h \
+       bufferview_funcs.C \
+       bufferview_funcs.h \
        bullet_forms.C \
        bullet_forms.h \
        bullet_forms_cb.C \
@@ -80,13 +109,17 @@ lyx_SOURCES = \
        combox.h \
        commandtags.h \
        config.h.in \
+       counters.C \
+       counters.h \
        credits.C \
        credits.h \
        credits_form.C \
        credits_form.h \
        debug.C \
        debug.h \
-       direction.h \
+       encoding.C \
+       encoding.h \
+       ext_l10n.h \
        figure.h \
        filedlg.C \
        filedlg.h \
@@ -106,12 +139,12 @@ lyx_SOURCES = \
        language.h \
        lastfiles.C \
        lastfiles.h \
-       latexoptions.C \
-       latexoptions.h \
        layout.C \
        layout.h \
        layout_forms.C \
        layout_forms.h \
+       log_form.C \
+       log_form.h \
        lyx.C \
        lyx.h \
        lyx_cb.C \
@@ -127,6 +160,7 @@ lyx_SOURCES = \
        lyx_sendfax_main.C \
        lyx_sty.C \
        lyx_sty.h \
+       lyxcursor.C \
        lyxcursor.h \
        lyxfont.C \
        lyxfont.h \
@@ -138,11 +172,14 @@ lyx_SOURCES = \
        lyxfunc.h \
        lyxlex.C \
        lyxlex.h \
+       lyxlex_pimpl.C \
+       lyxlex_pimpl.h \
        lyxlookup.C \
        lyxlookup.h \
        lyxparagraph.h \
        lyxrc.C \
        lyxrc.h \
+       lyxrow.C \
        lyxrow.h \
        lyxscreen.h \
        lyxserver.C \
@@ -169,18 +206,17 @@ lyx_SOURCES = \
        stl_string_fwd.h \
        table.C \
        table.h \
+       tabular.C \
+       tabular.h \
        tex-accent.C \
        tex-accent.h \
        tex-defs.h \
        tex-strings.C \
        tex-strings.h \
-       texoptions.C \
        texrow.C \
        texrow.h \
        text.C \
        text2.C \
-       toolbar.C \
-       toolbar.h \
        tracer.C \
        tracer.h \
        trans.C \