small cleanups, mostly from John

[features.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 44e17767e1ea4c564f9ce935f3202ad35619ed9b..bd153c01fd41053fc97e17d8cd225537c8730582 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,10 +9,8 @@ bin_PROGRAMS = lyx
 ## magically, but I do not understand them much (JMarc)
 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 \
+       support/libsupport.la \
        @INCLUDED_SIGC@
 lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
        $(PSPELL_LIBS) @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
@@ -110,10 +108,12 @@ lyx_SOURCES = \
        exporter.h \
        ext_l10n.h \
        figure.h \
+       figure_form.C \
+       figure_form.h \
+       figureForm.C \
+       figureForm.h \
        font.C \
        font.h \
-       form1.C \
-       form1.h \
        gettext.C \
        gettext.h \
        importer.C \
@@ -130,8 +130,6 @@ lyx_SOURCES = \
        lastfiles.h \
        layout.C \
        layout.h \
-       lyx.C \
-       lyx.h \
        lyx_cb.C \
        lyx_cb.h \
        lyx_gui.C \
@@ -187,7 +185,6 @@ lyx_SOURCES = \
        tabular-old.C \
        tex-accent.C \
        tex-accent.h \
-       tex-defs.h \
        tex-strings.C \
        tex-strings.h \
        texrow.C \
@@ -213,7 +210,7 @@ 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
+       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