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

diff --git a/src/Makefile.am b/src/Makefile.am
index f44020a309..89bfd7189c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,27 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = mathed insets support frontends
+SUBDIRS = mathed insets graphics support frontends
 DISTCLEANFILES= *.orig *.rej *~ *.bak core libintl.h config.h
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/config.h.in
 bin_PROGRAMS = lyx
+## libfrontends is given twice on the link line because it needs stuff
+## from FRONTEND_GUILIB and inversely. If you do not like it, feel
+## free to provide another solution... Maybe signals would solve that
+## magically, but I do not understand them much (JMarc)
 lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
-	support/libsupport.la @FRONTEND_GUILIB@ frontends/libfrontends.la \
+	graphics/libgraphics.la \
+	frontends/libfrontends.la @FRONTEND_GUILIB@ \
+	frontends/libfrontends.la \
+	frontends/support/libfrontendsupport.la support/libsupport.la \
 	@INCLUDED_SIGC@
 lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
-	@FRONTEND_LDFLAGS@ @FRONTEND_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) @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 \
@@ -31,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 \
@@ -47,31 +52,26 @@ lyx_SOURCES = \
 	LaTeX.h \
 	LaTeXFeatures.C \
 	LaTeXFeatures.h \
-	LaTeXLog.C \
-	Literate.C \
-	Literate.h \
+	Lsstream.h \
 	LyXAction.C \
 	LyXAction.h \
 	LyXSendto.C \
 	LyXView.C \
 	LyXView.h \
 	Makefile.in \
+	MenuBackend.C \
+	MenuBackend.h \
 	Painter.C \
 	Painter.h \
 	PainterBase.C \
 	PainterBase.h \
-	PaperLayout.C \
-	ParagraphExtra.C \
 	PrinterParams.h \
 	Sectioning.h \
 	Sectioning.C \
 	Spacing.C \
 	Spacing.h \
-	TableLayout.C \
 	TextCache.C \
 	TextCache.h \
-	Timeout.C \
-	Timeout.h \
 	ToolbarDefaults.C \
 	ToolbarDefaults.h \
 	UpdateInset.C \
@@ -80,7 +80,6 @@ lyx_SOURCES = \
 	Variables.h \
 	WorkArea.C \
 	WorkArea.h \
-	bibforms.h \
 	bmtable.c \
 	bmtable.h \
 	broken_headers.h \
@@ -92,15 +91,14 @@ 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 \
 	combox.h \
 	commandtags.h \
 	config.h.in \
+	converter.C \
+	converter.h \
 	counters.C \
 	counters.h \
 	credits.C \
@@ -111,6 +109,9 @@ lyx_SOURCES = \
 	debug.h \
 	encoding.C \
 	encoding.h \
+	exporter.C \
+	exporter.h \
+	ext_l10n.h \
 	figure.h \
 	filedlg.C \
 	filedlg.h \
@@ -118,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 \
@@ -132,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 \
@@ -146,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 \
@@ -179,8 +176,6 @@ lyx_SOURCES = \
 	lyxvc.C \
 	lyxvc.h \
 	main.C \
-	menus.C \
-	menus.h \
 	minibuffer.C \
 	minibuffer.h \
 	nt_defines.h \
@@ -195,10 +190,9 @@ lyx_SOURCES = \
 	spellchecker.C \
 	spellchecker.h \
 	stl_string_fwd.h \
-	table.C \
-	table.h \
 	tabular.C \
 	tabular.h \
+	tabular-old.C \
 	tex-accent.C \
 	tex-accent.h \
 	tex-defs.h \
@@ -208,8 +202,6 @@ lyx_SOURCES = \
 	texrow.h \
 	text.C \
 	text2.C \
-	toolbar.C \
-	toolbar.h \
 	tracer.C \
 	tracer.h \
 	trans.C \
@@ -229,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