gross hack to set layout

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5cf14d8d5925ff41942e470b984dc68ecd568d5c..6f367ea49ba94e31bb2f0a1a0805c1dd1c2e4eb7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,13 +4,13 @@ DISTCLEANFILES= *.orig *.rej *~ *.bak core libintl.h config.h
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/config.h.in
 bin_PROGRAMS = lyx
 
-lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
-       graphics/libgraphics.la \
-       frontends/libfrontends.la \
-       support/libsupport.la \
+lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \
+       graphics/libgraphics.o \
+       frontends/libfrontends.o \
+       support/libsupport.o \
        @INCLUDED_SIGC@
 lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
-       $(PSPELL_LIBS) @AIKSAURUS_LIBS@
+       $(PSPELL_LIBS) @AIKSAURUS_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1
 EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
@@ -50,6 +50,8 @@ lyx_SOURCES = \
        FontInfo.h \
        FontLoader.C \
        FontLoader.h \
+       FuncStatus.C \
+       FuncStatus.h \
        LColor.C \
        LColor.h \
        LString.h \
@@ -83,13 +85,12 @@ lyx_SOURCES = \
        Thesaurus.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
-       UpdateInset.C \
-       UpdateInset.h \
        WorkArea.C \
        WorkArea.h \
        XFormsView.C \
        XFormsView.h \
        box.h \
+       box.C \
        broken_headers.h \
        buffer.C \
        buffer.h \
@@ -111,14 +112,8 @@ lyx_SOURCES = \
        encoding.h \
        exporter.C \
        exporter.h \
-       figure.h \
-       figure_form.C \
-       figure_form.h \
-       figureForm.C \
-       figureForm.h \
        font.C \
        font.h \
-       func_status.h \
        gettext.C \
        gettext.h \
        importer.C \
@@ -135,7 +130,6 @@ lyx_SOURCES = \
        language.h \
        lastfiles.C \
        lastfiles.h \
-       layout.C \
        layout.h \
        lengthcommon.C \
        lengthcommon.h \
@@ -159,6 +153,8 @@ lyx_SOURCES = \
        lyxfunc.h \
        lyxgluelength.C \
        lyxgluelength.h \
+       lyxlayout.C \
+       lyxlayout.h \
        lyxlength.C \
        lyxlength.h \
        lyxlex.C \
@@ -175,14 +171,15 @@ 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 \
        paragraph.h \
        paragraph_pimpl.C \
@@ -225,7 +222,6 @@ lyx_SOURCES = \
        vc-backend.h \
        version.C \
        version.h \
-       vms_defines.h \
        vspace.C \
        vspace.h