X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=02a878d56f9825cab33fb26aeb8f2ebef38b681e;hb=837869452ad8d917615aa4bca77402dc49ba094e;hp=5154354be2de8362bc87073061d43dc616d9a85f;hpb=9b4576b50b704d501a2d65ad347e9bbbed1a0d00;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 5154354be2..02a878d56f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,9 @@ 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 += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -13,22 +13,21 @@ endif
 
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = paper.h \
-	pch.h
+EXTRA_DIST = pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
-		 $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \
+		 $(ENCHANT_LIBS) $(HUNSPELL_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
 
 lyx_LDADD = \
 	liblyxcore.a \
-	mathed/liblyxmathed.a \
-	insets/liblyxinsets.a \
+	liblyxmathed.a \
+	liblyxinsets.a \
 	frontends/liblyxfrontends.a \
 	frontends/qt4/liblyxqt4.a \
-	graphics/liblyxgraphics.a \
+	liblyxgraphics.a \
 	support/liblyxsupport.a \
 	$(OTHERLIBS) \
 	$(QT4_LDFLAGS) \
@@ -40,20 +39,31 @@ if LYX_WIN_RESOURCE
 	windres -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
 endif
 
+if INSTALL_MACOSX
+lyx_LDFLAGS = -framework AppKit
+endif
+
 #lyx_LDFLAGS=-Wl,-O1
 
 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 +72,7 @@ endif
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
 	main.cpp \
+	$(APPLESPELL) \
 	$(ASPELL) \
 	BiblioInfo.h \
 	BiblioInfo.cpp \
@@ -73,6 +84,7 @@ lyx_SOURCES = \
 	Dimension.h \
 	$(ENCHANT) \
 	$(HUNSPELL) \
+	$(PWL) \
 	PrinterParams.cpp \
 	PrinterParams.h \
 	Thesaurus.cpp \
@@ -129,6 +141,7 @@ SOURCEFILESCORE = \
 	Language.cpp \
 	LaTeX.cpp \
 	LaTeXFeatures.cpp \
+	LaTeXPackages.cpp \
 	LayoutFile.cpp \
 	LayoutModuleList.cpp \
 	Length.cpp \
@@ -203,6 +216,7 @@ HEADERFILESCORE = \
 	DepTable.h \
 	DispatchResult.h \
 	DocIterator.h \
+	DocumentClassPtr.h \
 	Encoding.h \
 	ErrorList.h \
 	Exporter.h \
@@ -227,6 +241,7 @@ HEADERFILESCORE = \
 	KeySequence.h \
 	Language.h \
 	LaTeXFeatures.h \
+	LaTeXPackages.h \
 	LaTeX.h \
 	Layout.h \
 	LayoutEnums.h \
@@ -322,9 +337,11 @@ liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 
 ############################### Graphics ##############################
 
-noinst_LIBRARIES += graphics/liblyxgraphics.a
+noinst_LIBRARIES += liblyxgraphics.a
 
-graphics_liblyxgraphics_a_SOURCES = \
+liblyxgraphics_a_SOURCES = \
+	graphics/epstools.h \
+	graphics/epstools.cpp \
 	graphics/GraphicsCache.h \
 	graphics/GraphicsCache.cpp \
 	graphics/GraphicsCacheItem.h \
@@ -340,18 +357,17 @@ graphics_liblyxgraphics_a_SOURCES = \
 	graphics/PreviewImage.h \
 	graphics/PreviewImage.cpp \
 	graphics/PreviewLoader.h \
-	graphics/PreviewLoader.cpp \
-	graphics/Previews.h \
-	graphics/Previews.cpp
+	graphics/PreviewLoader.cpp
 
 
 ############################### Mathed  ##############################
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-noinst_LIBRARIES += mathed/liblyxmathed.a
+noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
+	mathed/CommandInset.cpp \
 	mathed/InsetMathAMSArray.cpp \
 	mathed/InsetMathArray.cpp \
 	mathed/InsetMathBig.cpp \
@@ -362,7 +378,6 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathCases.cpp \
 	mathed/InsetMathChar.cpp \
 	mathed/InsetMathColor.cpp \
-	mathed/CommandInset.cpp \
 	mathed/InsetMathComment.cpp \
 	mathed/InsetMathDecoration.cpp \
 	mathed/InsetMathDecoration.h \
@@ -381,7 +396,8 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathKern.cpp \
 	mathed/InsetMathLefteqn.cpp \
 	mathed/InsetMathLim.cpp \
-	mathed/MathMacro.cpp \
+	mathed/InsetMathCancel.cpp \
+	mathed/InsetMathCancelto.cpp \
 	mathed/InsetMathMatrix.cpp \
 	mathed/InsetMathNest.cpp \
 	mathed/InsetMathNumber.cpp \
@@ -405,11 +421,13 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathUnknown.cpp \
 	mathed/InsetMathXArrow.cpp \
 	mathed/InsetMathXYMatrix.cpp \
+	mathed/InsetMathDiagram.cpp \
 	mathed/MathAtom.cpp \
 	mathed/MathAutoCorrect.cpp \
 	mathed/MathData.cpp \
 	mathed/MathExtern.cpp \
 	mathed/MathFactory.cpp \
+	mathed/MathMacro.cpp \
 	mathed/MathMacroArgument.cpp \
 	mathed/MacroTable.cpp \
 	mathed/MathMacroTemplate.cpp \
@@ -419,16 +437,18 @@ SOURCEFILESMATHED = \
 	mathed/TextPainter.cpp
 
 HEADERFILESMATHED = \
+	mathed/CommandInset.h \
 	mathed/InsetMathAMSArray.h \
 	mathed/InsetMathArray.h \
 	mathed/InsetMathBig.h \
 	mathed/InsetMathBoldSymbol.h \
 	mathed/InsetMathBox.h \
 	mathed/InsetMathBrace.h \
+	mathed/InsetMathCancel.h \
+	mathed/InsetMathCancelto.h \
 	mathed/InsetMathCases.h \
 	mathed/InsetMathChar.h \
 	mathed/InsetMathColor.h \
-	mathed/CommandInset.h \
 	mathed/InsetMathComment.h \
 	mathed/InsetMathDelim.h \
 	mathed/InsetMathDiff.h \
@@ -446,7 +466,6 @@ HEADERFILESMATHED = \
 	mathed/InsetMathKern.h \
 	mathed/InsetMathLefteqn.h \
 	mathed/InsetMathLim.h \
-	mathed/MathMacro.h \
 	mathed/InsetMathMatrix.h \
 	mathed/InsetMathNest.h \
 	mathed/InsetMathNumber.h \
@@ -470,6 +489,7 @@ HEADERFILESMATHED = \
 	mathed/InsetMathUnknown.h \
 	mathed/InsetMathXArrow.h \
 	mathed/InsetMathXYMatrix.h \
+	mathed/InsetMathDiagram.h \
 	mathed/MathAtom.h \
 	mathed/MathAutoCorrect.h \
 	mathed/MathData.h \
@@ -477,6 +497,7 @@ HEADERFILESMATHED = \
 	mathed/MathExtern.h \
 	mathed/MathFactory.h \
 	mathed/MathGridInfo.h \
+	mathed/MathMacro.h \
 	mathed/MathMacroArgument.h \
 	mathed/MacroTable.h \
 	mathed/MathMacroTemplate.h \
@@ -487,25 +508,25 @@ HEADERFILESMATHED = \
 	mathed/MathSupport.h \
 	mathed/TextPainter.h
 
-mathed/lyxmathed.cpp:
+lyxmathed.cpp:
 	@echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
 
 if MONOLITHIC_MATHED
 
-BUILT_SOURCES += mathed/lyxmathed.cpp
-CLEANFILES += mathed/lyxmathed.cpp
+BUILT_SOURCES += lyxmathed.cpp
+CLEANFILES += lyxmathed.cpp
 
-mathed_liblyxmathed_a_SOURCES = mathed/lyxmathed.cpp $(HEADERFILESMATHED)
+liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
 
 else
 
-mathed_liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
+liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
 
 endif
 
 ############################### Insets  ##############################
 
-noinst_LIBRARIES += insets/liblyxinsets.a
+noinst_LIBRARIES += liblyxinsets.a
 
 SOURCEFILESINSETS = \
 	insets/ExternalSupport.cpp \
@@ -515,6 +536,7 @@ SOURCEFILESINSETS = \
 	insets/RenderGraphic.cpp \
 	insets/RenderPreview.cpp \
 	insets/Inset.cpp \
+	insets/InsetArgument.cpp \
 	insets/InsetBibitem.cpp \
 	insets/InsetBibtex.cpp \
 	insets/InsetBox.cpp \
@@ -537,6 +559,7 @@ SOURCEFILESINSETS = \
 	insets/InsetInclude.cpp \
 	insets/InsetIndex.cpp \
 	insets/InsetInfo.cpp \
+	insets/InsetIPA.cpp \
 	insets/InsetLabel.cpp \
 	insets/InsetLayout.cpp \
 	insets/InsetLine.cpp \
@@ -547,11 +570,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 \
@@ -569,6 +592,7 @@ HEADERFILESINSETS = \
 	insets/RenderGraphic.h \
 	insets/RenderPreview.h \
 	insets/Inset.h \
+	insets/InsetArgument.h \
 	insets/InsetBibitem.h \
 	insets/InsetBibtex.h \
 	insets/InsetBox.h \
@@ -592,6 +616,7 @@ HEADERFILESINSETS = \
 	insets/InsetInclude.h \
 	insets/InsetIndex.h \
 	insets/InsetInfo.h \
+	insets/InsetIPA.h \
 	insets/InsetPreview.h \
 	insets/InsetLabel.h \
 	insets/InsetLayout.h \
@@ -603,10 +628,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 \
@@ -620,18 +645,18 @@ HEADERFILESINSETS = \
 #	insets/InsetSection.h \
 #	insets/InsetSection.cpp
 
-insets/lyxinsets.cpp:
+lyxinsets.cpp:
 	@echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@
 
 if MONOLITHIC_INSETS
 
-BUILT_SOURCES += insets/lyxinsets.cpp
-CLEANFILES += insets/lyxinsets.cpp
+BUILT_SOURCES += lyxinsets.cpp
+CLEANFILES += lyxinsets.cpp
 
-insets_liblyxinsets_a_SOURCES = insets/lyxinsets.cpp $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
 
 else
 
-insets_liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
 endif