more guii moving around.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 51cd8b2859eb83ab022ad861a9f8ca945d3957a3..781714b83bd729d192e5bf74aa63b019f415d306 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,45 @@
-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.la insets/libinsets.la \
-       graphics/libgraphics.la \
+LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
        frontends/libfrontends.la \
-       support/libsupport.la \
-       @INCLUDED_SIGC@
-lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
+       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@
 
+#  @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+
 #lyx_LDFLAGS=-Wl,-O1
+
 EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
        Sectioning.h \
        Sectioning.C \
        Variables.C \
        Variables.h \
        counters.C \
-       counters.h
- 
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
+       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 \
@@ -50,6 +64,8 @@ lyx_SOURCES = \
        FontInfo.h \
        FontLoader.C \
        FontLoader.h \
+       FuncStatus.C \
+       FuncStatus.h \
        LColor.C \
        LColor.h \
        LString.h \
@@ -60,16 +76,8 @@ lyx_SOURCES = \
        Lsstream.h \
        LyXAction.C \
        LyXAction.h \
-       LyXSendto.C \
-       LyXView.C \
-       LyXView.h \
-       Makefile.in \
        MenuBackend.C \
        MenuBackend.h \
-       Painter.C \
-       Painter.h \
-       PainterBase.C \
-       PainterBase.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
        ParameterStruct.h \
@@ -83,12 +91,6 @@ lyx_SOURCES = \
        Thesaurus.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
-       UpdateInset.C \
-       UpdateInset.h \
-       WorkArea.C \
-       WorkArea.h \
-       XFormsView.C \
-       XFormsView.h \
        box.h \
        box.C \
        broken_headers.h \
@@ -112,14 +114,8 @@ lyx_SOURCES = \
        encoding.h \
        exporter.C \
        exporter.h \
-       figure.h \
-       figure_form.C \
-       figure_form.h \
-       figureForm.C \
-       figureForm.h \
        font.C \
        font.h \
-       func_status.h \
        gettext.C \
        gettext.h \
        importer.C \
@@ -143,8 +139,6 @@ lyx_SOURCES = \
        lyx_cb.h \
        lyx_gui.C \
        lyx_gui.h \
-       lyx_gui_misc.C \
-       lyx_gui_misc.h \
        lyx_main.C \
        lyx_main.h \
        lyx_sty.C \
@@ -167,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 \
@@ -186,16 +177,10 @@ lyx_SOURCES = \
        main.C \
        minibuffer.C \
        minibuffer.h \
-       nt_defines.h \
-       os2_defines.h \
-       os2_errortable.h \
        paragraph.C \
        paragraph.h \
        paragraph_pimpl.C \
        paragraph_pimpl.h \
-       print_form.C \
-       print_form.h \
-       screen.C \
        sp_base.h \
        sp_spell.C \
        sp_ispell.h \
@@ -214,8 +199,6 @@ lyx_SOURCES = \
        texrow.h \
        text.C \
        text2.C \
-       tracer.C \
-       tracer.h \
        trans.C \
        trans.h \
        trans_decl.h \
@@ -231,12 +214,11 @@ lyx_SOURCES = \
        vc-backend.h \
        version.C \
        version.h \
-       vms_defines.h \
        vspace.C \
        vspace.h
 
 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 \
+       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 commandtags.h language.h 
        $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \