X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=c5aa12b6ce833940c2ac0b5fa0b1f58952ff2098;hb=fd2124c83dfcfeaf33b64d1d33c8ceb8d9f5f9b9;hp=bab0cec8acd386443c1f0906943e46d1d737ef39;hpb=260c7f3187a7dd392888b1d1eea513abffd8f2f7;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index bab0cec8ac..c5aa12b6ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,58 +1,84 @@ include $(top_srcdir)/config/common.am -DISTCLEANFILES += config.h libintl.h +DISTCLEANFILES += config.h libintl.h version.C stamp-version version.C-tmp MAINTAINERCLEANFILES += $(srcdir)/config.h.in -SUBDIRS = mathed insets graphics support frontends +if BUILD_CLIENT_SUBDIR +CLIENT = client +endif -LIBS += @LIBS@ +SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx -bin_PROGRAMS = lyx +EXTRA_DIST = config.h.in stamp-h.in version.C.in \ + Sectioning.h \ + Sectioning.C \ + Variables.C \ + Variables.h \ + paper.h \ + pch.h + +LYX_PRE_LIBS = mathed/libmathed.la insets/libinsets.la \ + frontends/libfrontends.la -LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \ - frontends/libfrontends.la \ +LYX_POST_LIBS = frontends/controllers/libcontrollers.la \ graphics/libgraphics.la \ support/libsupport.la -BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \ - ../boost/libs/signals/src/libboostsignals.la +BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM) + +OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS) + +bin_PROGRAMS = lyx +noinst_PROGRAMS = $(FRONTENDS_PROGS) +EXTRA_PROGRAMS = lyx-xforms lyx-qt lyx-gtk + +lyx_xforms_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \ + frontends/xforms/libxforms.la $(LYX_POST_LIBS) $(OTHERLIBS) -#lyx_DEPENDENCIES = $(LYX_CONV_LIBS) $(INCLUDED_SIGC) +lyx_xforms_SOURCES = main.C -lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) @INTLLIBS@ \ - $(PSPELL_LIBS) @AIKSAURUS_LIBS@ +lyx_qt_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \ + frontends/qt2/libqt2.la $(LYX_POST_LIBS) $(OTHERLIBS) +lyx_qt_SOURCES = main.C -#lyx_LDADD = $(LYX_CONV_LIBS) $(SIGC_LIBS) $(BOOST_LIBS) $(INCLUDED_SIGC) @INTLLIBS@ \ -# $(PSPELL_LIBS) @AIKSAURUS_LIBS@ +lyx_gtk_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \ + frontends/gtk/libgtk.la $(LYX_POST_LIBS) $(OTHERLIBS) +lyx_gtk_SOURCES = main.C -# @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@ +lyx$(EXEEXT): $(FRONTENDS_PROGS) + rm -f $@ + $(LN_S) $< $@ #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 \ - tracer.C \ - tracer.h +BUILT_SOURCES = $(PCH_FILE) version.C -INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) -#INCLUDES = $(BOOST_INCLUDES) $(PSPELL_INCLUDES) +AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES) + +if USE_ASPELL +ASPELL = aspell.C aspell_local.h +endif +if USE_PSPELL +PSPELL = pspell.C pspell.h +endif +if USE_ISPELL +ISPELL = ispell.C ispell.h +endif -localedir = $(datadir)/locale -BUILT_SOURCES = version.C lyx_SOURCES = \ + Bidi.C \ + Bidi.h \ BufferView.C \ BufferView.h \ - BufferView2.C \ BufferView_pimpl.C \ BufferView_pimpl.h \ Bullet.C \ Bullet.h \ + BranchList.C \ + BranchList.h \ Chktex.C \ Chktex.h \ CutAndPaste.C \ @@ -63,68 +89,94 @@ lyx_SOURCES = \ FloatList.h \ Floating.C \ Floating.h \ + FontIterator.C \ + FontIterator.h \ FuncStatus.C \ FuncStatus.h \ InsetList.C \ InsetList.h \ LColor.C \ LColor.h \ - LString.h \ LaTeX.C \ LaTeX.h \ LaTeXFeatures.C \ LaTeXFeatures.h \ - Lsstream.h \ LyXAction.C \ LyXAction.h \ MenuBackend.C \ MenuBackend.h \ + ParagraphList_fwd.h \ ParagraphParameters.C \ ParagraphParameters.h \ - ParameterStruct.h \ + PrinterParams.C \ PrinterParams.h \ - ShareContainer.h \ + RowList_fwd.h \ Spacing.C \ Spacing.h \ - TextCache.C \ - TextCache.h \ Thesaurus.C \ Thesaurus.h \ - ToolbarDefaults.C \ - ToolbarDefaults.h \ + ToolbarBackend.C \ + ToolbarBackend.h \ + WordLangTuple.h \ + author.C \ + author.h \ + boost.C \ box.h \ box.C \ - broken_headers.h \ buffer.C \ buffer.h \ + buffer_funcs.C \ + buffer_funcs.h \ bufferlist.C \ bufferlist.h \ bufferparams.C \ bufferparams.h \ bufferview_funcs.C \ bufferview_funcs.h \ + changes.C \ + changes.h \ chset.C \ chset.h \ - commandtags.h \ config.h.in \ converter.C \ converter.h \ counters.C \ counters.h \ + coordcache.C \ + coordcache.h \ + cursor.C \ + cursor.h \ + cursor_slice.C \ + cursor_slice.h \ debug.C \ debug.h \ + dimension.C \ + dimension.h \ + dociterator.C \ + dociterator.h \ + dispatchresult.h \ encoding.C \ encoding.h \ + errorlist.C \ + errorlist.h \ exporter.C \ exporter.h \ gettext.C \ gettext.h \ + factory.h \ + factory.C \ + format.C \ + format.h \ + funcrequest.h \ + funcrequest.C \ + graph.C \ + graph.h \ importer.C \ importer.h \ intl.C \ intl.h \ - iterators.C \ - iterators.h \ + insetiterator.C \ + insetiterator.h \ kbmap.C \ kbmap.h \ kbsequence.C \ @@ -136,14 +188,13 @@ lyx_SOURCES = \ layout.h \ lengthcommon.C \ lengthcommon.h \ + lfuns.h \ lyx_cb.C \ lyx_cb.h \ lyx_main.C \ lyx_main.h \ lyx_sty.C \ lyx_sty.h \ - lyxcursor.C \ - lyxcursor.h \ lyxfont.C \ lyxfont.h \ lyxfind.C \ @@ -165,8 +216,12 @@ lyx_SOURCES = \ lyxrc.h \ lyxrow.C \ lyxrow.h \ + lyxrow_funcs.C \ + lyxrow_funcs.h \ lyxserver.C \ lyxserver.h \ + lyxsocket.C \ + lyxsocket.h \ lyxtext.h \ lyxtextclass.C \ lyxtextclass.h \ @@ -174,23 +229,41 @@ lyx_SOURCES = \ lyxtextclasslist.h \ lyxvc.C \ lyxvc.h \ - main.C \ + messages.C \ + messages.h \ + metricsinfo.C \ + metricsinfo.h \ + mover.C \ + mover.h \ + output.C \ + output.h \ + outputparams.C \ + outputparams.h \ + output_docbook.C \ + output_docbook.h \ + output_latex.C \ + output_latex.h \ + output_linuxdoc.C \ + output_linuxdoc.h \ + output_plaintext.C \ + output_plaintext.h \ + paper.h \ paragraph.C \ paragraph.h \ + paragraph_funcs.C \ + paragraph_funcs.h \ paragraph_pimpl.C \ paragraph_pimpl.h \ + pariterator.C \ + pariterator.h \ + $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.C \ SpellBase.h \ - ispell.C \ - ispell.h \ - pspell.C \ - pspell.h \ + rowpainter.C \ + rowpainter.h \ sgml.C \ sgml.h \ tabular.C \ tabular.h \ - tabular-old.C \ - tabular_funcs.C \ - tabular_funcs.h \ tex-accent.C \ tex-accent.h \ tex-strings.C \ @@ -199,6 +272,7 @@ lyx_SOURCES = \ texrow.h \ text.C \ text2.C \ + text3.C \ toc.C \ toc.h \ trans.C \ @@ -208,8 +282,6 @@ lyx_SOURCES = \ trans_mgr.h \ undo.C \ undo.h \ - undo_funcs.C \ - undo_funcs.h \ vc-backend.C \ vc-backend.h \ version.C \ @@ -217,15 +289,14 @@ lyx_SOURCES = \ vspace.C \ vspace.h -lyx_main.o: lyx_main.C lyx_main.h config.h version.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)\" \ - -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 support/os.h - $(CXXCOMPILE) -DLOCALEDIR=\"$(localedir)\" -c $(top_srcdir)/src/main.C +version.C: stamp-version + @: -dist-hook: - cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*` +stamp-version: version.C-tmp + if cmp -s $< version.C ; then \ + : ;\ + else \ + rm -f version.C ;\ + cp $< version.C ;\ + fi + echo timestamp > $@