cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ef9f546742cde317e0e1e8df4af897a6345d4633..fee27309734d29f0a9a33a4dd74191806148aad7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,8 @@ EXTRA_DIST = config.h.in stamp-h.in version.C.in \
        Sectioning.C \
        Variables.C \
        Variables.h \
-       paper.h
+       paper.h \
+       pch.h
 
 LYX_PRE_LIBS = mathed/libmathed.la insets/libinsets.la \
        frontends/libfrontends.la
@@ -24,22 +25,21 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
        graphics/libgraphics.la \
        support/libsupport.la
 
-BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM)
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS)
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@
+OTHERLIBS = $(BOOST_LIBS) $(LIBICONV) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
 bin_PROGRAMS = lyx
 noinst_PROGRAMS = $(FRONTENDS_PROGS)
-EXTRA_PROGRAMS = lyx-xforms lyx-qt lyx-gtk
-
-lyx_xforms_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-       frontends/xforms/libxforms.la $(LYX_POST_LIBS) $(OTHERLIBS)
+EXTRA_PROGRAMS = lyx-qt3 lyx-gtk lyx-qt4
 
-lyx_xforms_SOURCES = main.C
+lyx_qt3_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
+       frontends/qt3/libqt3.la $(LYX_POST_LIBS) $(OTHERLIBS)
+lyx_qt3_SOURCES = main.C
 
-lyx_qt_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-       frontends/qt2/libqt2.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_qt_SOURCES = main.C
+lyx_qt4_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
+       frontends/qt4/libqt4.la $(LYX_POST_LIBS) $(OTHERLIBS)
+lyx_qt4_SOURCES = main.C
 
 lyx_gtk_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
        frontends/gtk/libgtk.la $(LYX_POST_LIBS) $(OTHERLIBS)
@@ -51,7 +51,7 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-BUILT_SOURCES = version.C
+BUILT_SOURCES = $(PCH_FILE) version.C
 
 AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES)
 
@@ -72,14 +72,14 @@ lyx_SOURCES = \
        Bidi.h \
        BufferView.C \
        BufferView.h \
-       BufferView_pimpl.C \
-       BufferView_pimpl.h \
        Bullet.C \
        Bullet.h \
        BranchList.C \
        BranchList.h \
        Chktex.C \
        Chktex.h \
+       Color.C \
+       Color.h \
        CutAndPaste.C \
        CutAndPaste.h \
        DepTable.C \
@@ -104,6 +104,7 @@ lyx_SOURCES = \
        LyXAction.h \
        MenuBackend.C \
        MenuBackend.h \
+       ParagraphList.h \
        ParagraphList_fwd.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
@@ -182,8 +183,8 @@ lyx_SOURCES = \
        kbsequence.h \
        language.C \
        language.h \
-       lastfiles.C \
-       lastfiles.h \
+       session.C \
+       session.h \
        layout.h \
        lengthcommon.C \
        lengthcommon.h \
@@ -242,8 +243,6 @@ lyx_SOURCES = \
        output_docbook.h \
        output_latex.C \
        output_latex.h \
-       output_linuxdoc.C \
-       output_linuxdoc.h \
        output_plaintext.C \
        output_plaintext.h \
        paper.h \
@@ -272,6 +271,8 @@ lyx_SOURCES = \
        text.C \
        text2.C \
        text3.C \
+       TocBackend.C \
+       TocBackend.h \
        toc.C \
        toc.h \
        trans.C \