X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=7c90cf2cee41da6bdf498d7456646867db20f0f5;hb=2417d9d911dbca181c48f45d1aad26d31c9aa815;hp=90a1a25af21ca1f7b07903a677a4c5e8bed4d0f0;hpb=052d7ab6814e57afad2ba0d143aa4b26648add4a;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 90a1a25af2..7c90cf2cee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,10 +21,9 @@ EXTRA_DIST = config.h.in \
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
 pkglib_LTLIBRARIES = liblyxcore.la
-noinst_PROGRAMS = $(FRONTENDS_PROGS)
-EXTRA_PROGRAMS = lyx-qt4
+bin_PROGRAMS = lyx
 
-lyx_qt4_LDADD = \
+lyx_LDADD = \
 	liblyxcore.la \
 	liblyxmathed.la \
 	liblyxinsets.la \
@@ -36,9 +35,11 @@ lyx_qt4_LDADD = \
 	$(OTHERLIBS) \
 	$(QT4_LIB) 
 
-lyx$(EXEEXT): $(FRONTENDS_PROGS)
-	rm -f $@
-	$(LN_S) $< $@
+if LYX_WIN_RESOURCE
+.rc.o:
+	cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico .
+	windres -I. --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
+endif
 
 #lyx_LDFLAGS=-Wl,-O1
 
@@ -54,7 +55,11 @@ if USE_ISPELL
 ISPELL = ISpell.cpp ISpell.h
 endif
 
-lyx_qt4_SOURCES = \
+# These four objects are linked as object files as they are not
+# referenced within the core and therefore are not picked up
+# by the linker without looping over libs. We do not want that,
+# and in fact libtools seems not able to do that.
+lyx_SOURCES = \
 	main.cpp \
 	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
 	Box.cpp \
@@ -66,9 +71,15 @@ lyx_qt4_SOURCES = \
 	Thesaurus.cpp \
 	Thesaurus.h
 
+if LYX_WIN_RESOURCE
+lyx_SOURCES += lyxwinres.rc
+endif
+
 liblyxcore_la_SOURCES = \
 	Author.cpp \
 	Author.h \
+	BiblioInfo.h \
+	BiblioInfo.cpp \
 	Bidi.cpp \
 	Bidi.h \
 	boost.cpp \
@@ -116,6 +127,8 @@ liblyxcore_la_SOURCES = \
 	DispatchResult.h \
 	DocIterator.cpp \
 	DocIterator.h \
+	EmbeddedFiles.h \
+	EmbeddedFiles.cpp \
 	Encoding.cpp \
 	Encoding.h \
 	ErrorList.cpp \
@@ -194,6 +207,8 @@ liblyxcore_la_SOURCES = \
 	Messages.h \
 	MetricsInfo.cpp \
 	MetricsInfo.h \
+	ModuleList.cpp \
+	ModuleList.h \
 	Mover.cpp \
 	Mover.h \
 	output.cpp \
@@ -218,6 +233,8 @@ liblyxcore_la_SOURCES = \
 	ParagraphParameters.h \
 	ParIterator.cpp \
 	ParIterator.h \
+	PDFOptions.cpp \
+	PDFOptions.h \
 	Row.cpp \
 	Row.h \
 	rowpainter.cpp \
@@ -478,8 +495,6 @@ liblyxinsets_la_SOURCES = \
 	insets/InsetBranch.h \
 	insets/InsetCaption.cpp \
 	insets/InsetCaption.h \
-	insets/InsetCharStyle.cpp \
-	insets/InsetCharStyle.h \
 	insets/InsetCitation.cpp \
 	insets/InsetCitation.h \
 	insets/InsetCollapsable.cpp \
@@ -494,6 +509,8 @@ liblyxinsets_la_SOURCES = \
 	insets/InsetERT.h \
 	insets/InsetExternal.cpp \
 	insets/InsetExternal.h \
+	insets/InsetFlex.h \
+	insets/InsetFlex.cpp \
 	insets/InsetFloat.h \
 	insets/InsetFloat.cpp \
 	insets/InsetFloatList.cpp \