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 f88b2f64dce6b54ba5088b2e0d72700b2adb81a7..59a3d1ce9ce61bdb010e8177e4bb6e32ff56b0b2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,40 +4,44 @@ include $(top_srcdir)/config/common.am
 
 DISTCLEANFILES += config.h libintl.h
 
-MAINTAINERCLEANFILES += $(srcdir)/config.h.in
-
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) 
+
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
 
-SUBDIRS = support frontends tex2lyx client .
+SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = config.h.in \
-       Section.h \
+EXTRA_DIST = Section.h \
        Section.cpp \
        Variables.cpp \
        Variables.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
@@ -47,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
@@ -60,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 \
@@ -122,6 +120,7 @@ SOURCEFILESCORE = \
        LaTeX.cpp \
        LaTeXFeatures.cpp \
        LayoutFile.cpp \
+       LayoutModuleList.cpp \
        Length.cpp \
        lengthcommon.cpp \
        Lexer.cpp \
@@ -160,7 +159,6 @@ SOURCEFILESCORE = \
        TextClass.cpp \
        TextMetrics.cpp \
        TocBackend.cpp \
-       ToolbarBackend.cpp \
        Trans.cpp \
        Undo.cpp \
        VCBackend.cpp \
@@ -184,8 +182,8 @@ HEADERFILESCORE = \
        CmdDef.h \
        ColorCode.h \
        Color.h \
+       ColorSet.h \
        CompletionList.h \
-       config.h.in \
        ConverterCache.h \
        Converter.h \
        CoordCache.h \
@@ -222,6 +220,7 @@ HEADERFILESCORE = \
        Layout.h \
        LayoutEnums.h \
        LayoutFile.h \
+       LayoutModuleList.h \
        Length.h \
        Lexer.h \
        LyXAction.h \
@@ -260,7 +259,6 @@ HEADERFILESCORE = \
        TextClass.h \
        TextMetrics.h \
        TocBackend.h \
-       ToolbarBackend.h \
        Trans.h \
        Undo.h \
        update_flags.h \
@@ -282,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 \
@@ -302,13 +300,11 @@ liblyxgraphics_la_SOURCES = \
        graphics/GraphicsConverter.h \
        graphics/GraphicsConverter.cpp \
        graphics/GraphicsImage.h \
-       graphics/GraphicsImage.cpp \
        graphics/GraphicsLoader.h \
        graphics/GraphicsLoader.cpp \
        graphics/GraphicsParams.cpp \
        graphics/GraphicsParams.h \
        graphics/GraphicsTypes.h \
-       graphics/GraphicsTypes.cpp \
        graphics/PreviewImage.h \
        graphics/PreviewImage.cpp \
        graphics/PreviewLoader.h \
@@ -321,7 +317,7 @@ liblyxgraphics_la_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-noinst_LTLIBRARIES += liblyxmathed.la
+noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
        mathed/InsetMathAMSArray.cpp \
@@ -341,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 \
@@ -364,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 \
@@ -403,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 \
@@ -427,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 \
@@ -449,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 \
@@ -462,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 \
@@ -491,7 +492,6 @@ SOURCEFILESINSETS = \
        insets/InsetCollapsable.cpp \
        insets/InsetCommand.cpp \
        insets/InsetCommandParams.cpp \
-       insets/InsetEnvironment.cpp \
        insets/InsetERT.cpp \
        insets/InsetExternal.cpp \
        insets/InsetFlex.cpp \
@@ -516,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 \
@@ -546,7 +547,6 @@ HEADERFILESINSETS = \
        insets/InsetCommand.h \
        insets/InsetCommandParams.h \
        insets/InsetERT.h \
-       insets/InsetEnvironment.h \
        insets/InsetExternal.h \
        insets/InsetFlex.h \
        insets/InsetFloat.h \
@@ -570,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 \
@@ -593,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