more guii moving around.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 34ead44ed81356cc47b820614ab16cab6a22de9e..781714b83bd729d192e5bf74aa63b019f415d306 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,26 @@
-AUTOMAKE_OPTIONS = foreign
+include $(top_srcdir)/config/common.am
+
+DISTCLEANFILES += config.h libintl.h
+
+MAINTAINERCLEANFILES += $(srcdir)/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
+
+LIBS += @LIBS@
+
 bin_PROGRAMS = lyx
 
-lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \
-       graphics/libgraphics.o \
-       frontends/libfrontends.o \
-       support/libsupport.o \
-       @INCLUDED_SIGC@
+LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
+       frontends/libfrontends.la \
+       graphics/libgraphics.la \
+       support/libsupport.la
+
+#lyx_DEPENDENCIES = $(LYX_CONV_LIBS) $(INCLUDED_SIGC)
+
+lyx_LDADD = $(LYX_CONV_LIBS) $(SIGC_LIBS) $(INCLUDED_SIGC) @INTLLIBS@ \
+       $(PSPELL_LIBS) @AIKSAURUS_LIBS@
 
-lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
-       $(PSPELL_LIBS) @AIKSAURUS_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+#  @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1
 
@@ -21,13 +30,16 @@ EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
        Variables.C \
        Variables.h \
        counters.C \
-       counters.h
- 
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
+       counters.h \
+       tracer.C \
+       tracer.h
+
 INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
+
 localedir = $(datadir)/locale
+
 BUILT_SOURCES = version.C
+
 lyx_SOURCES = \
        BufferView.C \
        BufferView.h \
@@ -64,15 +76,8 @@ lyx_SOURCES = \
        Lsstream.h \
        LyXAction.C \
        LyXAction.h \
-       LyXView.C \
-       LyXView.h \
-       Makefile.in \
        MenuBackend.C \
        MenuBackend.h \
-       Painter.C \
-       Painter.h \
-       PainterBase.C \
-       PainterBase.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
        ParameterStruct.h \
@@ -86,10 +91,6 @@ lyx_SOURCES = \
        Thesaurus.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
-       WorkArea.C \
-       WorkArea.h \
-       XFormsView.C \
-       XFormsView.h \
        box.h \
        box.C \
        broken_headers.h \
@@ -160,13 +161,10 @@ lyx_SOURCES = \
        lyxlex.h \
        lyxlex_pimpl.C \
        lyxlex_pimpl.h \
-       lyxlookup.C \
-       lyxlookup.h \
        lyxrc.C \
        lyxrc.h \
        lyxrow.C \
        lyxrow.h \
-       lyxscreen.h \
        lyxserver.C \
        lyxserver.h \
        lyxtext.h \
@@ -183,7 +181,6 @@ lyx_SOURCES = \
        paragraph.h \
        paragraph_pimpl.C \
        paragraph_pimpl.h \
-       screen.C \
        sp_base.h \
        sp_spell.C \
        sp_ispell.h \
@@ -202,8 +199,6 @@ lyx_SOURCES = \
        texrow.h \
        text.C \
        text2.C \
-       tracer.C \
-       tracer.h \
        trans.C \
        trans.h \
        trans_decl.h \