X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=89bfd7189cc0a9489332926681065189afba2d65;hb=f65b7ff4ab2fe8ad0d9196c231064240e3fde81f;hp=419fdb19868aaec2f996d969e2c88d208c844d56;hpb=3ff3b95d3c7fdc814cb774221370964da4e283ce;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 419fdb1986..89bfd7189c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,16 +10,18 @@ bin_PROGRAMS = lyx
 lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
 	graphics/libgraphics.la \
 	frontends/libfrontends.la @FRONTEND_GUILIB@ \
-	frontends/libfrontends.la support/libsupport.la @INCLUDED_SIGC@
+	frontends/libfrontends.la \
+	frontends/support/libfrontendsupport.la support/libsupport.la \
+	@INCLUDED_SIGC@
 lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
 	$(PSPELL_LIBS) @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 #lyx_LDFLAGS=-Wl,-O1
 EXTRA_DIST = config.h.in stamp-h.in cheaders
 ETAGS_ARGS = --lang=c++
-INCLUDES = $(SIGC_CFLAGS) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
+BOOST_INCLUDES = -I$(top_srcdir)/boost
+INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
 localedir = $(datadir)/locale
 lyx_SOURCES = \
-	BackStack.h \
 	BufferView.C \
 	BufferView.h \
 	BufferView2.C \
@@ -37,15 +39,12 @@ lyx_SOURCES = \
 	DepTable.h \
 	FloatList.C \
 	FloatList.h \
+	Floating.C \
 	Floating.h \
 	FontInfo.C \
 	FontInfo.h \
 	FontLoader.C \
 	FontLoader.h \
-	ImportLaTeX.C \
-	ImportLaTeX.h \
-	ImportNoweb.C \
-	ImportNoweb.h \
 	LColor.C \
 	LColor.h \
 	LString.h \
@@ -53,9 +52,6 @@ lyx_SOURCES = \
 	LaTeX.h \
 	LaTeXFeatures.C \
 	LaTeXFeatures.h \
-	LaTeXLog.C \
-	Literate.C \
-	Literate.h \
 	Lsstream.h \
 	LyXAction.C \
 	LyXAction.h \
@@ -69,8 +65,6 @@ lyx_SOURCES = \
 	Painter.h \
 	PainterBase.C \
 	PainterBase.h \
-	PaperLayout.C \
-	ParagraphExtra.C \
 	PrinterParams.h \
 	Sectioning.h \
 	Sectioning.C \
@@ -78,8 +72,6 @@ lyx_SOURCES = \
 	Spacing.h \
 	TextCache.C \
 	TextCache.h \
-	Timeout.C \
-	Timeout.h \
 	ToolbarDefaults.C \
 	ToolbarDefaults.h \
 	UpdateInset.C \
@@ -88,7 +80,6 @@ lyx_SOURCES = \
 	Variables.h \
 	WorkArea.C \
 	WorkArea.h \
-	bibforms.h \
 	bmtable.c \
 	bmtable.h \
 	broken_headers.h \
@@ -100,9 +91,6 @@ lyx_SOURCES = \
 	bufferparams.h \
 	bufferview_funcs.C \
 	bufferview_funcs.h \
-	bullet_forms.C \
-	bullet_forms.h \
-	bullet_forms_cb.C \
 	chset.C \
 	chset.h \
 	combox.C \
@@ -131,7 +119,10 @@ lyx_SOURCES = \
 	font.h \
 	form1.C \
 	form1.h \
+	gettext.C \
 	gettext.h \
+	importer.C \
+	importer.h \
 	include_form.h \
 	intl.C \
 	intl.h \
@@ -145,10 +136,6 @@ lyx_SOURCES = \
 	lastfiles.h \
 	layout.C \
 	layout.h \
-	layout_forms.C \
-	layout_forms.h \
-	log_form.C \
-	log_form.h \
 	lyx.C \
 	lyx.h \
 	lyx_cb.C \
@@ -159,9 +146,6 @@ lyx_SOURCES = \
 	lyx_gui_misc.h \
 	lyx_main.C \
 	lyx_main.h \
-	lyx_sendfax.C \
-	lyx_sendfax.h \
-	lyx_sendfax_main.C \
 	lyx_sty.C \
 	lyx_sty.h \
 	lyxcursor.C \
@@ -208,6 +192,7 @@ lyx_SOURCES = \
 	stl_string_fwd.h \
 	tabular.C \
 	tabular.h \
+	tabular-old.C \
 	tex-accent.C \
 	tex-accent.h \
 	tex-defs.h \
@@ -236,7 +221,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 
+	lyxserver.h layout.h gettext.h kbmap.h commandtags.h
 	$(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \
 	  -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C