-lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la support/libsupport.la
-lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS)
-EXTRA_DIST = config.h.in stamp-h.in cheaders
-ETAGS_ARGS = --c++
-INCLUDES = -I${top_srcdir}/images
+
+lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
+ graphics/libgraphics.la \
+ frontends/libfrontends.la \
+ support/libsupport.la \
+ @INCLUDED_SIGC@
+lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
+ $(PSPELL_LIBS) @AIKSAURUS_LIBS@
+
+#lyx_LDFLAGS=-Wl,-O1
+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@