X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=02b9b29bb430d70b36e4f62f8d2cb5ff927b0163;hb=3dfe917a4ed504de29ac18028936d02f856c92b1;hp=f4a5701d0cba2739127bd6591913ad89807f57c8;hpb=ddd4cb61522b4759e3fda0306dbc926080e2378b;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index f4a5701d0c..02b9b29bb4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 ############################### Core  ##############################
 
-DISTCLEANFILES += config.h libintl.h
+DISTCLEANFILES += libintl.h
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
@@ -13,10 +13,9 @@ endif
 
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = paper.h \
-	pch.h
+EXTRA_DIST = pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \
 		 $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 noinst_LIBRARIES = liblyxcore.a
@@ -44,16 +43,23 @@ endif
 
 BUILT_SOURCES = $(PCH_FILE)
 
+if INSTALL_MACOSX
+APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h
+endif
+
 if USE_ASPELL
 ASPELL = AspellChecker.cpp AspellChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
 endif
 
 if USE_ENCHANT
 ENCHANT = EnchantChecker.cpp EnchantChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
 endif
 
 if USE_HUNSPELL
 HUNSPELL = HunspellChecker.cpp HunspellChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
 endif
 
 # These four objects are linked as object files as they are not
@@ -62,6 +68,7 @@ endif
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
 	main.cpp \
+	$(APPLESPELL) \
 	$(ASPELL) \
 	BiblioInfo.h \
 	BiblioInfo.cpp \
@@ -73,6 +80,7 @@ lyx_SOURCES = \
 	Dimension.h \
 	$(ENCHANT) \
 	$(HUNSPELL) \
+	$(PWL) \
 	PrinterParams.cpp \
 	PrinterParams.h \
 	Thesaurus.cpp \
@@ -405,6 +413,7 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathUnknown.cpp \
 	mathed/InsetMathXArrow.cpp \
 	mathed/InsetMathXYMatrix.cpp \
+	mathed/InsetMathDiagram.cpp \
 	mathed/MathAtom.cpp \
 	mathed/MathAutoCorrect.cpp \
 	mathed/MathData.cpp \
@@ -470,6 +479,7 @@ HEADERFILESMATHED = \
 	mathed/InsetMathUnknown.h \
 	mathed/InsetMathXArrow.h \
 	mathed/InsetMathXYMatrix.h \
+	mathed/InsetMathDiagram.h \
 	mathed/MathAtom.h \
 	mathed/MathAutoCorrect.h \
 	mathed/MathData.h \
@@ -515,6 +525,7 @@ SOURCEFILESINSETS = \
 	insets/RenderGraphic.cpp \
 	insets/RenderPreview.cpp \
 	insets/Inset.cpp \
+	insets/InsetArgument.cpp \
 	insets/InsetBibitem.cpp \
 	insets/InsetBibtex.cpp \
 	insets/InsetBox.cpp \
@@ -547,10 +558,11 @@ SOURCEFILESINSETS = \
 	insets/InsetNewpage.cpp \
 	insets/InsetNomencl.cpp \
 	insets/InsetNote.cpp \
-	insets/InsetOptArg.cpp \
 	insets/InsetPhantom.cpp \
+	insets/InsetPreview.cpp \
 	insets/InsetQuotes.cpp \
 	insets/InsetRef.cpp \
+	insets/InsetScript.cpp \
 	insets/InsetSpace.cpp \
 	insets/InsetSpecialChar.cpp \
 	insets/InsetTabular.cpp \
@@ -568,6 +580,7 @@ HEADERFILESINSETS = \
 	insets/RenderGraphic.h \
 	insets/RenderPreview.h \
 	insets/Inset.h \
+	insets/InsetArgument.h \
 	insets/InsetBibitem.h \
 	insets/InsetBibtex.h \
 	insets/InsetBox.h \
@@ -591,6 +604,7 @@ HEADERFILESINSETS = \
 	insets/InsetInclude.h \
 	insets/InsetIndex.h \
 	insets/InsetInfo.h \
+	insets/InsetPreview.h \
 	insets/InsetLabel.h \
 	insets/InsetLayout.h \
 	insets/InsetLine.h \
@@ -601,10 +615,10 @@ HEADERFILESINSETS = \
 	insets/InsetNewpage.h \
 	insets/InsetNomencl.h \
 	insets/InsetNote.h \
-	insets/InsetOptArg.h \
 	insets/InsetPhantom.h \
 	insets/InsetQuotes.h \
 	insets/InsetRef.h \
+	insets/InsetScript.h \
 	insets/InsetSpace.h \
 	insets/InsetSpecialChar.h \
 	insets/InsetTabular.h \