redraw fix 1.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 950e4c79c95c5674c8754e5454b2f2fe16f85bb2..ff2276faf9f84a01903ef5aef0d5c069402fd8e5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,24 +6,27 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
 SUBDIRS = mathed insets graphics support frontends
 
+LIBS += @LIBS@
+
 bin_PROGRAMS = lyx
 
-if USE_LD_R
-LYX_CONV_LIBS = mathed/libmathed.o insets/libinsets.o \
-       frontends/libfrontends.o \
-       graphics/libgraphics.o \
-       support/libsupport.o
-else
 LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
        frontends/libfrontends.la \
        graphics/libgraphics.la \
        support/libsupport.la
-endif
+
+BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
+       ../boost/libs/signals/src/libboostsignals.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_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) @INTLLIBS@ \
+       $(PSPELL_LIBS) @AIKSAURUS_LIBS@
+
+#lyx_LDADD = $(LYX_CONV_LIBS) $(SIGC_LIBS) $(BOOST_LIBS) $(INCLUDED_SIGC) @INTLLIBS@ \
+#      $(PSPELL_LIBS) @AIKSAURUS_LIBS@
+
+#  @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1
 
@@ -33,11 +36,17 @@ EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
        Variables.C \
        Variables.h \
        counters.C \
-       counters.h
+       counters.h \
+       tracer.C \
+       tracer.h
 
 INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
+#INCLUDES = $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
+
 localedir = $(datadir)/locale
+
 BUILT_SOURCES = version.C
+
 lyx_SOURCES = \
        BufferView.C \
        BufferView.h \
@@ -48,8 +57,6 @@ lyx_SOURCES = \
        Bullet.h \
        Chktex.C \
        Chktex.h \
-       ColorHandler.C \
-       ColorHandler.h \
        CutAndPaste.C \
        CutAndPaste.h \
        DepTable.C \
@@ -58,10 +65,6 @@ lyx_SOURCES = \
        FloatList.h \
        Floating.C \
        Floating.h \
-       FontInfo.C \
-       FontInfo.h \
-       FontLoader.C \
-       FontLoader.h \
        FuncStatus.C \
        FuncStatus.h \
        LColor.C \
@@ -74,14 +77,8 @@ lyx_SOURCES = \
        Lsstream.h \
        LyXAction.C \
        LyXAction.h \
-       LyXView.C \
-       LyXView.h \
        MenuBackend.C \
        MenuBackend.h \
-       Painter.C \
-       Painter.h \
-       PainterBase.C \
-       PainterBase.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
        ParameterStruct.h \
@@ -95,10 +92,6 @@ lyx_SOURCES = \
        Thesaurus.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
-       WorkArea.C \
-       WorkArea.h \
-       XFormsView.C \
-       XFormsView.h \
        box.h \
        box.C \
        broken_headers.h \
@@ -122,8 +115,6 @@ lyx_SOURCES = \
        encoding.h \
        exporter.C \
        exporter.h \
-       font.C \
-       font.h \
        gettext.C \
        gettext.h \
        importer.C \
@@ -145,8 +136,6 @@ lyx_SOURCES = \
        lengthcommon.h \
        lyx_cb.C \
        lyx_cb.h \
-       lyx_gui.C \
-       lyx_gui.h \
        lyx_main.C \
        lyx_main.h \
        lyx_sty.C \
@@ -163,19 +152,17 @@ lyx_SOURCES = \
        lyxgluelength.h \
        lyxlayout.C \
        lyxlayout.h \
+       lyxlayout_ptr_fwd.h \
        lyxlength.C \
        lyxlength.h \
        lyxlex.C \
        lyxlex.h \
        lyxlex_pimpl.C \
        lyxlex_pimpl.h \
-       lyxlookup.C \
-       lyxlookup.h \
        lyxrc.C \
        lyxrc.h \
        lyxrow.C \
        lyxrow.h \
-       lyxscreen.h \
        lyxserver.C \
        lyxserver.h \
        lyxtext.h \
@@ -186,18 +173,14 @@ lyx_SOURCES = \
        lyxvc.C \
        lyxvc.h \
        main.C \
-       minibuffer.C \
-       minibuffer.h \
        paragraph.C \
        paragraph.h \
        paragraph_pimpl.C \
        paragraph_pimpl.h \
-       screen.C \
        sp_base.h \
        sp_spell.C \
        sp_ispell.h \
        sp_pspell.h \
-       stl_string_fwd.h \
        tabular.C \
        tabular.h \
        tabular-old.C \
@@ -211,8 +194,6 @@ lyx_SOURCES = \
        texrow.h \
        text.C \
        text2.C \
-       tracer.C \
-       tracer.h \
        trans.C \
        trans.h \
        trans_decl.h \
@@ -222,8 +203,6 @@ lyx_SOURCES = \
        undo.h \
        undo_funcs.C \
        undo_funcs.h \
-       undostack.C \
-       undostack.h \
        vc-backend.C \
        vc-backend.h \
        version.C \
@@ -231,15 +210,14 @@ lyx_SOURCES = \
        vspace.C \
        vspace.h
 
-lyx_main.o: lyx_main.C lyx_main.h config.h version.h lyx_gui.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 
+       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 \
-       support/os.h frontends/GUIRunTime.h
+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
 
 dist-hook: