X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=3f71e765f569dcadfaf032024fe83717023810a6;hb=e5706b107da902bc6a28cba0de3ccd6f75d9fee7;hp=fe8665c74ee4455b7735709e11924b3cd2360cdf;hpb=f566e7c6040e5e60d140f3da625fe5f191eebbcc;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index fe8665c74e..3f71e765f5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,48 +1,74 @@ 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 +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 + +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 +if USE_INCLUDED_BOOST +BOOST_LIBS = $(top_builddir)/boost/libs/regex/src/libboostregex.la \ + $(top_builddir)/boost/libs/signals/src/libboostsignals.la +else +BOOST_LIBS = -lboost_regex -lboost_signals +endif -lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \ - $(PSPELL_LIBS) $(AIKSAURUS_LIBS) @LIBS@ +OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ -#lyx_LDFLAGS=-Wl,-O1 +bin_PROGRAMS = lyx +noinst_PROGRAMS = $(FRONTENDS_PROGS) +EXTRA_PROGRAMS = lyx-xforms lyx-qt lyx-gtk -EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \ - Sectioning.h \ - Sectioning.C \ - Variables.C \ - Variables.h \ - tracer.C \ - tracer.h +lyx_xforms_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \ + frontends/xforms/libxforms.la $(LYX_POST_LIBS) $(OTHERLIBS) + +lyx_xforms_SOURCES = main.C + +lyx_qt_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \ + frontends/qt2/libqt2.la $(LYX_POST_LIBS) $(OTHERLIBS) +lyx_qt_SOURCES = main.C -INCLUDES = $(BOOST_INCLUDES) $(PSPELL_INCLUDES) +lyx_gtk_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \ + frontends/gtk/libgtk.la $(LYX_POST_LIBS) $(OTHERLIBS) +lyx_gtk_SOURCES = main.C -localedir = $(datadir)/locale +lyx$(EXEEXT): $(FRONTENDS_PROGS) + rm -f $@ + $(LN_S) $< $@ + +#lyx_LDFLAGS=-Wl,-O1 + +INCLUDES = $(BOOST_INCLUDES) BUILT_SOURCES = version.C +AM_CXXFLAGS = $(PCH_FLAGS) + lyx_SOURCES = \ - BoostFormat.h \ + 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 \ CutAndPaste.C \ @@ -53,49 +79,47 @@ 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 \ - 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 \ + aspell.C \ + aspell_local.h \ author.C \ author.h \ boost.C \ - boost-inst.C \ box.h \ box.C \ broken_headers.h \ buffer.C \ buffer.h \ + buffer_funcs.C \ + buffer_funcs.h \ bufferlist.C \ bufferlist.h \ bufferparams.C \ @@ -106,30 +130,46 @@ lyx_SOURCES = \ 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 \ @@ -141,14 +181,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 \ @@ -170,8 +209,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 \ @@ -179,11 +222,33 @@ 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 \ SpellBase.h \ ispell.C \ ispell.h \ @@ -195,9 +260,6 @@ lyx_SOURCES = \ sgml.h \ tabular.C \ tabular.h \ - tabular-old.C \ - tabular_funcs.C \ - tabular_funcs.h \ tex-accent.C \ tex-accent.h \ tex-strings.C \ @@ -216,28 +278,37 @@ lyx_SOURCES = \ trans_mgr.h \ undo.C \ undo.h \ - undo_funcs.C \ - undo_funcs.h \ vc-backend.C \ vc-backend.h \ version.C \ version.h \ vspace.C \ - vspace.h \ - graph.C \ - graph.h \ - format.C \ - format.h + 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 +dist_noinst_DATA = \ + cheaders/ChangeLog \ + cheaders/cassert \ + cheaders/cctype \ + cheaders/cerrno \ + cheaders/climits \ + cheaders/clocale \ + cheaders/cmath \ + cheaders/csignal \ + cheaders/cstdarg \ + cheaders/cstddef \ + cheaders/cstdio \ + cheaders/cstdlib \ + cheaders/cstring \ + cheaders/ctime -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 > $@