small changes to ButtonController usage

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1fafd15471c224b19d5f56442e98d3964b105945..db30fb92710cc9148a03cacc6cb3af6bb7feca01 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,16 +1,22 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = mathed insets support frontends
+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 \
-       support/libsupport.la @FRONTEND_GUILIB@ frontends/libfrontends.la \
-       @INCLUDED_SIGC@
+       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 = --lang=c++
-INCLUDES = -I${top_srcdir}/images $(SIGC_CFLAGS) @FRONTEND_INCLUDES@
+INCLUDES = $(SIGC_CFLAGS) @FRONTEND_INCLUDES@
 localedir = $(datadir)/locale
 lyx_SOURCES = \
        BackStack.h \
@@ -56,6 +62,8 @@ lyx_SOURCES = \
        LyXView.C \
        LyXView.h \
        Makefile.in \
+       MenuBackend.C \
+       MenuBackend.h \
        Painter.C \
        Painter.h \
        PainterBase.C \
@@ -111,6 +119,7 @@ lyx_SOURCES = \
        debug.h \
        encoding.C \
        encoding.h \
+       ext_l10n.h \
        figure.h \
        filedlg.C \
        filedlg.h \
@@ -208,8 +217,6 @@ lyx_SOURCES = \
        texrow.h \
        text.C \
        text2.C \
-       toolbar.C \
-       toolbar.h \
        tracer.C \
        tracer.h \
        trans.C \