bug 183

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1c281449c6fffa2915f3ea01b972037891a3d714..3190ecc44985ad873ec1f24aafc64ae921fd4dc1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,23 +3,29 @@ 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
-## 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 \
        support/libsupport.la \
        @INCLUDED_SIGC@
-lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
-       $(PSPELL_LIBS) @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@ @AIKSAURUS_LIBS@
+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
+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
+ 
 ETAGS_ARGS = --lang=c++
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
 localedir = $(datadir)/locale
+BUILT_SOURCES = version.C
 lyx_SOURCES = \
        BufferView.C \
        BufferView.h \
@@ -44,6 +50,8 @@ lyx_SOURCES = \
        FontInfo.h \
        FontLoader.C \
        FontLoader.h \
+       FuncStatus.C \
+       FuncStatus.h \
        LColor.C \
        LColor.h \
        LString.h \
@@ -68,8 +76,6 @@ lyx_SOURCES = \
        ParagraphParameters.h \
        ParameterStruct.h \
        PrinterParams.h \
-       Sectioning.h \
-       Sectioning.C \
        ShareContainer.h \
        Spacing.C \
        Spacing.h \
@@ -81,12 +87,12 @@ lyx_SOURCES = \
        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 \
@@ -102,8 +108,6 @@ lyx_SOURCES = \
        config.h.in \
        converter.C \
        converter.h \
-       counters.C \
-       counters.h \
        debug.C \
        debug.h \
        encoding.C \
@@ -117,7 +121,6 @@ lyx_SOURCES = \
        figureForm.h \
        font.C \
        font.h \
-       func_status.h \
        gettext.C \
        gettext.h \
        importer.C \
@@ -134,8 +137,9 @@ 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 \
@@ -154,6 +158,12 @@ 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 \
@@ -168,6 +178,10 @@ lyx_SOURCES = \
        lyxserver.C \
        lyxserver.h \
        lyxtext.h \
+       lyxtextclass.C \
+       lyxtextclass.h \
+       lyxtextclasslist.C \
+       lyxtextclasslist.h \
        lyxvc.C \
        lyxvc.h \
        main.C \
@@ -191,6 +205,8 @@ lyx_SOURCES = \
        tabular.C \
        tabular.h \
        tabular-old.C \
+       tabular_funcs.C \
+       tabular_funcs.h \
        tex-accent.C \
        tex-accent.h \
        tex-strings.C \
@@ -214,6 +230,7 @@ lyx_SOURCES = \
        undostack.h \
        vc-backend.C \
        vc-backend.h \
+       version.C \
        version.h \
        vms_defines.h \
        vspace.C \
@@ -222,11 +239,12 @@ 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 commandtags.h language.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: