X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=247d37b6a3686577367a5ddb3ade20ed43b3bd57;hb=d4f8fe124906af839a02d1ad3b7894e14fb69a37;hp=a62dbc50ec27bd594ecdcdb50ca0f7f4c7af82da;hpb=0458e5028bfe856fe5e0d5bee50e4e8cde2bbf85;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index a62dbc50ec..247d37b6a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,57 +1,79 @@ 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 tex2lyx +if BUILD_CLIENT_SUBDIR +CLIENT = client +endif + +SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx -EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \ +EXTRA_DIST = config.h.in stamp-h.in version.C.in \ Sectioning.h \ Sectioning.C \ Variables.C \ Variables.h \ - tracer.C \ - tracer.h + paper.h \ + pch.h -bin_PROGRAMS = lyx +LYX_PRE_LIBS = mathed/libmathed.la insets/libinsets.la \ + frontends/libfrontends.la -LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \ - frontends/libfrontends.la \ - $(FRONTEND_GUILIB) \ - frontends/controllers/libcontrollers.la \ +LYX_POST_LIBS = frontends/controllers/libcontrollers.la \ graphics/libgraphics.la \ support/libsupport.la -if USE_INCLUDED_BOOST -BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \ - ../boost/libs/signals/src/libboostsignals.la -else -BOOST_LIBS = -lboost_regex -lboost_signals -endif +BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS) + +OTHERLIBS = $(BOOST_LIBS) $(LIBICONV) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS) -lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \ - $(AIKSAURUS_LIBS) @LIBS@ +bin_PROGRAMS = lyx +noinst_PROGRAMS = $(FRONTENDS_PROGS) +EXTRA_PROGRAMS = lyx-qt4 + +lyx_qt4_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \ + frontends/qt4/libqt4.la $(LYX_POST_LIBS) $(OTHERLIBS) +lyx_qt4_SOURCES = main.C -lyx_DEPENDENCIES = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) +lyx$(EXEEXT): $(FRONTENDS_PROGS) + rm -f $@ + $(LN_S) $< $@ #lyx_LDFLAGS=-Wl,-O1 -INCLUDES = $(BOOST_INCLUDES) +BUILT_SOURCES = $(PCH_FILE) version.C + +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 \ - BufferView_pimpl.C \ - BufferView_pimpl.h \ Bullet.C \ Bullet.h \ + BranchList.C \ + BranchList.h \ Chktex.C \ Chktex.h \ + Color.C \ + Color.h \ + ConverterCache.C \ + ConverterCache.h \ CutAndPaste.C \ CutAndPaste.h \ DepTable.C \ @@ -60,51 +82,46 @@ 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 \ - paragraph_funcs.C \ - paragraph_funcs.h \ - ParagraphList.C \ ParagraphList.h \ + ParagraphList_fwd.h \ ParagraphParameters.C \ ParagraphParameters.h \ - ParameterStruct.h \ + PrinterParams.C \ PrinterParams.h \ - RowList.h \ - ShareContainer.h \ + RowList_fwd.h \ Spacing.C \ Spacing.h \ - TextCache.C \ - TextCache.h \ Thesaurus.C \ Thesaurus.h \ ToolbarBackend.C \ ToolbarBackend.h \ + UpdateFlags.h \ WordLangTuple.h \ - aspell.C \ - aspell_local.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 \ @@ -115,18 +132,28 @@ lyx_SOURCES = \ changes.h \ chset.C \ chset.h \ - lfuns.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 \ @@ -143,27 +170,26 @@ lyx_SOURCES = \ importer.h \ intl.C \ intl.h \ - iterators.C \ - iterators.h \ + insetiterator.C \ + insetiterator.h \ kbmap.C \ kbmap.h \ kbsequence.C \ kbsequence.h \ language.C \ language.h \ - lastfiles.C \ - lastfiles.h \ + session.C \ + session.h \ 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 \ @@ -185,10 +211,10 @@ 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 \ @@ -196,28 +222,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_plaintext.C \ + output_plaintext.h \ + paper.h \ paragraph.C \ paragraph.h \ + ParagraphMetrics.C \ + ParagraphMetrics.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_funcs.C \ - tabular_funcs.h \ tex-accent.C \ tex-accent.h \ tex-strings.C \ @@ -227,8 +266,10 @@ lyx_SOURCES = \ text.C \ text2.C \ text3.C \ - text_funcs.C \ - text_funcs.h \ + TextMetrics.C \ + TextMetrics.h \ + TocBackend.C \ + TocBackend.h \ toc.C \ toc.h \ trans.C \ @@ -238,8 +279,6 @@ lyx_SOURCES = \ trans_mgr.h \ undo.C \ undo.h \ - undo_funcs.C \ - undo_funcs.h \ vc-backend.C \ vc-backend.h \ version.C \ @@ -247,15 +286,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 lfuns.h language.h - $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \ - -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C - -messages.o: messages.C messages.h config.h LString.h support/filetools.h - $(CXXCOMPILE) -DLOCALEDIR=\"$(localedir)\" -c $(top_srcdir)/src/messages.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 > $@