Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e7bc09e807f151d73e5eb33b920a51ecf39569a9..44e17767e1ea4c564f9ce935f3202ad35619ed9b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
        graphics/libgraphics.la \
        frontends/libfrontends.la @FRONTEND_GUILIB@ \
        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) \
@@ -84,8 +85,6 @@ lyx_SOURCES = \
        Variables.h \
        WorkArea.C \
        WorkArea.h \
-       bmtable.c \
-       bmtable.h \
        broken_headers.h \
        buffer.C \
        buffer.h \
@@ -97,8 +96,6 @@ lyx_SOURCES = \
        bufferview_funcs.h \
        chset.C \
        chset.h \
-       combox.C \
-       combox.h \
        commandtags.h \
        config.h.in \
        converter.C \