X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=33c8d01a3013409e6dce18dac0a625ad8a7bbef7;hb=f360c39690150b6ff9116ff56c39c3a0e0a92fd2;hp=59b6fef0b2209689cdc1d2bca618429cd70bf7cd;hpb=0f1623f064f2b8ad4dd47619e51bb08c1b9d1506;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index 59b6fef0b2..33c8d01a30 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,19 +1,24 @@ 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 + lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \ - support/libsupport.la @FRONTEND_GUILIB@ frontends/libfrontends.la \ + graphics/libgraphics.la \ + frontends/libfrontends.la \ + support/libsupport.la \ @INCLUDED_SIGC@ -lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \ - @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@ -EXTRA_DIST = config.h.in stamp-h.in cheaders +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++ -INCLUDES = -I${top_srcdir}/images $(SIGC_CFLAGS) @FRONTEND_INCLUDES@ +BOOST_INCLUDES = -I$(top_srcdir)/boost +INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@ localedir = $(datadir)/locale lyx_SOURCES = \ - BackStack.h \ BufferView.C \ BufferView.h \ BufferView2.C \ @@ -31,15 +36,12 @@ lyx_SOURCES = \ DepTable.h \ FloatList.C \ FloatList.h \ + Floating.C \ Floating.h \ FontInfo.C \ FontInfo.h \ FontLoader.C \ FontLoader.h \ - ImportLaTeX.C \ - ImportLaTeX.h \ - ImportNoweb.C \ - ImportNoweb.h \ LColor.C \ LColor.h \ LString.h \ @@ -47,38 +49,42 @@ lyx_SOURCES = \ LaTeX.h \ LaTeXFeatures.C \ LaTeXFeatures.h \ - LaTeXLog.C \ - Literate.C \ - Literate.h \ + 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 \ - PaperLayout.C \ - ParagraphExtra.C \ + ParagraphParameters.C \ + ParagraphParameters.h \ + ParameterStruct.h \ PrinterParams.h \ + Sectioning.h \ + Sectioning.C \ + ShareContainer.h \ Spacing.C \ Spacing.h \ - TableLayout.C \ TextCache.C \ TextCache.h \ - Timeout.C \ - Timeout.h \ + Thesaurus.C \ + Thesaurus.h \ ToolbarDefaults.C \ ToolbarDefaults.h \ UpdateInset.C \ UpdateInset.h \ + Variables.C \ + Variables.h \ WorkArea.C \ WorkArea.h \ - bibforms.h \ - bmtable.c \ - bmtable.h \ + XFormsView.C \ + XFormsView.h \ broken_headers.h \ buffer.C \ buffer.h \ @@ -88,34 +94,36 @@ lyx_SOURCES = \ bufferparams.h \ bufferview_funcs.C \ bufferview_funcs.h \ - bullet_forms.C \ - bullet_forms.h \ - bullet_forms_cb.C \ chset.C \ chset.h \ - combox.C \ - combox.h \ commandtags.h \ config.h.in \ - credits.C \ - credits.h \ - credits_form.C \ - credits_form.h \ + converter.C \ + converter.h \ + counters.C \ + counters.h \ debug.C \ debug.h \ encoding.C \ encoding.h \ + exporter.C \ + exporter.h \ figure.h \ - filedlg.C \ - filedlg.h \ + figure_form.C \ + figure_form.h \ + figureForm.C \ + figureForm.h \ font.C \ font.h \ - form1.C \ - form1.h \ + func_status.h \ + gettext.C \ gettext.h \ - include_form.h \ + importer.C \ + importer.h \ intl.C \ intl.h \ + iterators.C \ + iterators.h \ kbmap.C \ kbmap.h \ kbsequence.C \ @@ -124,14 +132,8 @@ lyx_SOURCES = \ language.h \ lastfiles.C \ lastfiles.h \ - latexoptions.C \ - latexoptions.h \ layout.C \ layout.h \ - layout_forms.C \ - layout_forms.h \ - lyx.C \ - lyx.h \ lyx_cb.C \ lyx_cb.h \ lyx_gui.C \ @@ -140,19 +142,14 @@ lyx_SOURCES = \ lyx_gui_misc.h \ lyx_main.C \ lyx_main.h \ - lyx_sendfax.C \ - lyx_sendfax.h \ - lyx_sendfax_main.C \ lyx_sty.C \ lyx_sty.h \ lyxcursor.C \ lyxcursor.h \ lyxfont.C \ lyxfont.h \ - lyxfr0.C \ - lyxfr0.h \ - lyxfr1.C \ - lyxfr1.h \ + lyxfind.C \ + lyxfind.h \ lyxfunc.C \ lyxfunc.h \ lyxlex.C \ @@ -161,7 +158,6 @@ lyx_SOURCES = \ lyxlex_pimpl.h \ lyxlookup.C \ lyxlookup.h \ - lyxparagraph.h \ lyxrc.C \ lyxrc.h \ lyxrow.C \ @@ -173,38 +169,34 @@ lyx_SOURCES = \ lyxvc.C \ lyxvc.h \ main.C \ - menus.C \ - menus.h \ 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_form.C \ - sp_form.h \ - spellchecker.C \ - spellchecker.h \ + sp_base.h \ + sp_spell.C \ + sp_ispell.h \ + sp_pspell.h \ stl_string_fwd.h \ - table.C \ - table.h \ tabular.C \ tabular.h \ + tabular-old.C \ 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 \ @@ -214,9 +206,14 @@ lyx_SOURCES = \ trans_mgr.h \ undo.C \ undo.h \ + undo_funcs.C \ + undo_funcs.h \ + undostack.C \ + undostack.h \ vc-backend.C \ vc-backend.h \ version.h \ + version_info.h.in \ vms_defines.h \ vspace.C \ vspace.h @@ -224,11 +221,13 @@ lyx_SOURCES = \ 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 \ bufferlist.h debug.h support/FileInfo.h lastfiles.h intl.h \ - lyxserver.h layout.h gettext.h kbmap.h + lyxserver.h layout.h gettext.h kbmap.h commandtags.h language.h \ + version_info.h.in $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \ -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C -main.o: main.C config.h lyx_main.h gettext.h LString.h support/filetools.h +main.o: main.C config.h lyx_main.h gettext.h LString.h support/filetools.h \ + support/os.h frontends/GUIRunTime.h $(CXXCOMPILE) -DLOCALEDIR=\"$(localedir)\" -c $(top_srcdir)/src/main.C dist-hook: