Fix bug 4441. GuiRef: Ok button must be default.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 88b1e11e4911978f29f01e3483b3e3841dc3ab09..59a3d1ce9ce61bdb010e8177e4bb6e32ff56b0b2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,7 @@ include $(top_srcdir)/config/common.am
 DISTCLEANFILES += config.h libintl.h
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) 
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = client
@@ -19,26 +20,28 @@ EXTRA_DIST = Section.h \
        paper.h \
        pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
+           @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI)
 
-noinst_LTLIBRARIES = liblyxcore.la
+noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
 
 lyx_LDADD = \
-       liblyxcore.la \
-       liblyxmathed.la \
-       liblyxinsets.la \
-       frontends/liblyxfrontends.la \
-       frontends/qt4/liblyxqt4.la \
-       liblyxgraphics.la \
-       support/liblyxsupport.la \
+       liblyxcore.a \
+       liblyxmathed.a \
+       liblyxinsets.a \
+       frontends/liblyxfrontends.a \
+       frontends/qt4/liblyxqt4.a \
+       liblyxgraphics.a \
+       support/liblyxsupport.a \
        $(OTHERLIBS) \
+       $(QT4_LDFLAGS) \
        $(QT4_LIB) 
 
 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 $@
+       windres -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
 endif
 
 #lyx_LDFLAGS=-Wl,-O1
@@ -48,12 +51,6 @@ BUILT_SOURCES = $(PCH_FILE)
 if USE_ASPELL
 ASPELL = ASpell.cpp ASpell_local.h
 endif
-if USE_PSPELL
-PSPELL = PSpell.cpp PSpell.h
-endif
-if USE_ISPELL
-ISPELL = ISpell.cpp ISpell.h
-endif
 
 # These four objects are linked as object files as they are not
 # referenced within the core and therefore are not picked up
@@ -61,7 +58,7 @@ endif
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
        main.cpp \
-       $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+       $(ASPELL) SpellBase.cpp \
        BiblioInfo.h \
        BiblioInfo.cpp \
        Box.cpp \
@@ -123,6 +120,7 @@ SOURCEFILESCORE = \
        LaTeX.cpp \
        LaTeXFeatures.cpp \
        LayoutFile.cpp \
+       LayoutModuleList.cpp \
        Length.cpp \
        lengthcommon.cpp \
        Lexer.cpp \
@@ -184,6 +182,7 @@ HEADERFILESCORE = \
        CmdDef.h \
        ColorCode.h \
        Color.h \
+       ColorSet.h \
        CompletionList.h \
        ConverterCache.h \
        Converter.h \
@@ -221,6 +220,7 @@ HEADERFILESCORE = \
        Layout.h \
        LayoutEnums.h \
        LayoutFile.h \
+       LayoutModuleList.h \
        Length.h \
        Lexer.h \
        LyXAction.h \
@@ -280,19 +280,19 @@ if MONOLITHIC_CORE
 BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
 CLEANFILES += lyxcore.cpp
 
-liblyxcore_la_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
+liblyxcore_a_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
 
 else
 
-liblyxcore_la_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
+liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
 
 endif
 
 ############################### Graphics ##############################
 
-noinst_LTLIBRARIES += liblyxgraphics.la
+noinst_LIBRARIES += liblyxgraphics.a
 
-liblyxgraphics_la_SOURCES = \
+liblyxgraphics_a_SOURCES = \
        graphics/GraphicsCache.h \
        graphics/GraphicsCache.cpp \
        graphics/GraphicsCacheItem.h \
@@ -300,7 +300,6 @@ liblyxgraphics_la_SOURCES = \
        graphics/GraphicsConverter.h \
        graphics/GraphicsConverter.cpp \
        graphics/GraphicsImage.h \
-       graphics/GraphicsImage.cpp \
        graphics/GraphicsLoader.h \
        graphics/GraphicsLoader.cpp \
        graphics/GraphicsParams.cpp \
@@ -318,7 +317,7 @@ liblyxgraphics_la_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-noinst_LTLIBRARIES += liblyxmathed.la
+noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
        mathed/InsetMathAMSArray.cpp \
@@ -338,6 +337,7 @@ SOURCEFILESMATHED = \
        mathed/InsetMathDelim.cpp \
        mathed/InsetMathDiff.cpp \
        mathed/InsetMathDots.cpp \
+       mathed/InsetMathEnsureMath.cpp \
        mathed/InsetMathEnv.cpp \
        mathed/InsetMathExFunc.cpp \
        mathed/InsetMathExInt.cpp \
@@ -361,6 +361,7 @@ SOURCEFILESMATHED = \
        mathed/InsetMathScript.cpp \
        mathed/InsetMathSize.cpp \
        mathed/InsetMathSpace.cpp \
+       mathed/InsetMathSpecialChar.cpp \
        mathed/InsetMathSplit.cpp \
        mathed/InsetMathSqrt.cpp \
        mathed/InsetMathStackrel.cpp \
@@ -400,6 +401,7 @@ HEADERFILESMATHED = \
        mathed/InsetMathDelim.h \
        mathed/InsetMathDiff.h \
        mathed/InsetMathDots.h \
+       mathed/InsetMathEnsureMath.h \
        mathed/InsetMathEnv.h \
        mathed/InsetMathExFunc.h \
        mathed/InsetMathExInt.h \
@@ -424,6 +426,7 @@ HEADERFILESMATHED = \
        mathed/InsetMathScript.h \
        mathed/InsetMathSize.h \
        mathed/InsetMathSpace.h \
+       mathed/InsetMathSpecialChar.h \
        mathed/InsetMathSplit.h \
        mathed/InsetMathSqrt.h \
        mathed/InsetMathStackrel.h \
@@ -446,6 +449,7 @@ HEADERFILESMATHED = \
        mathed/MacroTable.h \
        mathed/MathMacroTemplate.h \
        mathed/MathParser.h \
+       mathed/MathParser_flags.h \
        mathed/ReplaceData.h \
        mathed/MathStream.h \
        mathed/MathSupport.h \
@@ -459,17 +463,17 @@ if MONOLITHIC_MATHED
 BUILT_SOURCES += lyxmathed.cpp
 CLEANFILES += lyxmathed.cpp
 
-liblyxmathed_la_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
+liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
 
 else
 
-liblyxmathed_la_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) 
+liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) 
 
 endif
 
 ############################### Insets  ##############################
 
-noinst_LTLIBRARIES += liblyxinsets.la
+noinst_LIBRARIES += liblyxinsets.a
 
 SOURCEFILESINSETS = \
        insets/ExternalSupport.cpp \
@@ -512,6 +516,7 @@ SOURCEFILESINSETS = \
        insets/InsetNomencl.cpp \
        insets/InsetNote.cpp \
        insets/InsetOptArg.cpp \
+       insets/InsetPhantom.cpp \
        insets/InsetQuotes.cpp \
        insets/InsetRef.cpp \
        insets/InsetSpace.cpp \
@@ -565,6 +570,7 @@ HEADERFILESINSETS = \
        insets/InsetNomencl.h \
        insets/InsetNote.h \
        insets/InsetOptArg.h \
+       insets/InsetPhantom.h \
        insets/InsetQuotes.h \
        insets/InsetRef.h \
        insets/InsetSpace.h \
@@ -588,10 +594,10 @@ if MONOLITHIC_INSETS
 BUILT_SOURCES += lyxinsets.cpp
 CLEANFILES += lyxinsets.cpp
 
-liblyxinsets_la_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
 
 else
 
-liblyxinsets_la_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
 endif