]> git.lyx.org Git - lyx.git/blobdiff - src/Makefile.am
fix lookup problem for \vert.
[lyx.git] / src / Makefile.am
index a95e2915208c7bc6d0dea2ed512c3cb6fe8ad660..d5940914254f7a9291ea50cc83eb06ea63681f11 100644 (file)
@@ -1,27 +1,43 @@
-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
-## libfrontends is given twice on the link line because it needs stuff
-## from FRONTEND_GUILIB and inversely. If you do not like it, feel
-## free to provide another solution... Maybe signals would solve that
-## magically, but I do not understand them much (JMarc)
-lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
-       graphics/libgraphics.la \
-       frontends/libfrontends.la @FRONTEND_GUILIB@ \
+
+LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
        frontends/libfrontends.la \
-       frontends/controllers/libcontrollers.la \
-       frontends/support/libfrontendsupport.la support/libsupport.la \
-       @INCLUDED_SIGC@
-lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
-       $(PSPELL_LIBS) @FRONTEND_LDFLAGS@ @FRONTEND_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
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
+
+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
+
+INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
+
 localedir = $(datadir)/locale
+
+BUILT_SOURCES = version.C
+
 lyx_SOURCES = \
        BufferView.C \
        BufferView.h \
@@ -46,6 +62,8 @@ lyx_SOURCES = \
        FontInfo.h \
        FontLoader.C \
        FontLoader.h \
+       FuncStatus.C \
+       FuncStatus.h \
        LColor.C \
        LColor.h \
        LString.h \
@@ -56,10 +74,8 @@ lyx_SOURCES = \
        Lsstream.h \
        LyXAction.C \
        LyXAction.h \
-       LyXSendto.C \
        LyXView.C \
        LyXView.h \
-       Makefile.in \
        MenuBackend.C \
        MenuBackend.h \
        Painter.C \
@@ -70,21 +86,21 @@ lyx_SOURCES = \
        ParagraphParameters.h \
        ParameterStruct.h \
        PrinterParams.h \
-       Sectioning.h \
-       Sectioning.C \
        ShareContainer.h \
        Spacing.C \
        Spacing.h \
        TextCache.C \
        TextCache.h \
+       Thesaurus.C \
+       Thesaurus.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
-       UpdateInset.C \
-       UpdateInset.h \
-       Variables.C \
-       Variables.h \
        WorkArea.C \
        WorkArea.h \
+       XFormsView.C \
+       XFormsView.h \
+       box.h \
+       box.C \
        broken_headers.h \
        buffer.C \
        buffer.h \
@@ -100,20 +116,12 @@ lyx_SOURCES = \
        config.h.in \
        converter.C \
        converter.h \
-       counters.C \
-       counters.h \
        debug.C \
        debug.h \
        encoding.C \
        encoding.h \
        exporter.C \
        exporter.h \
-       ext_l10n.h \
-       figure.h \
-       figure_form.C \
-       figure_form.h \
-       figureForm.C \
-       figureForm.h \
        font.C \
        font.h \
        gettext.C \
@@ -122,6 +130,8 @@ lyx_SOURCES = \
        importer.h \
        intl.C \
        intl.h \
+       iterators.C \
+       iterators.h \
        kbmap.C \
        kbmap.h \
        kbsequence.C \
@@ -130,14 +140,13 @@ lyx_SOURCES = \
        language.h \
        lastfiles.C \
        lastfiles.h \
-       layout.C \
        layout.h \
+       lengthcommon.C \
+       lengthcommon.h \
        lyx_cb.C \
        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 \
@@ -150,13 +159,18 @@ lyx_SOURCES = \
        lyxfind.h \
        lyxfunc.C \
        lyxfunc.h \
+       lyxgluelength.C \
+       lyxgluelength.h \
+       lyxlayout.C \
+       lyxlayout.h \
+       lyxlength.C \
+       lyxlength.h \
        lyxlex.C \
        lyxlex.h \
        lyxlex_pimpl.C \
        lyxlex_pimpl.h \
        lyxlookup.C \
        lyxlookup.h \
-       lyxparagraph.h \
        lyxrc.C \
        lyxrc.h \
        lyxrow.C \
@@ -165,29 +179,32 @@ lyx_SOURCES = \
        lyxserver.C \
        lyxserver.h \
        lyxtext.h \
+       lyxtextclass.C \
+       lyxtextclass.h \
+       lyxtextclasslist.C \
+       lyxtextclasslist.h \
        lyxvc.C \
        lyxvc.h \
        main.C \
        minibuffer.C \
        minibuffer.h \
-       nt_defines.h \
-       os2_defines.h \
-       os2_errortable.h \
        paragraph.C \
-       print_form.C \
-       print_form.h \
+       paragraph.h \
+       paragraph_pimpl.C \
+       paragraph_pimpl.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 \
        tabular.C \
        tabular.h \
        tabular-old.C \
+       tabular_funcs.C \
+       tabular_funcs.h \
        tex-accent.C \
        tex-accent.h \
-       tex-defs.h \
        tex-strings.C \
        tex-strings.h \
        texrow.C \
@@ -203,21 +220,26 @@ 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.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
+       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
+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: