X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=bc0d3682a16a3dfe3eb944df43468d24df489c03;hb=acc5af9912533261c37795971af269f77317f14f;hp=f1c9a5cbe4e933ff57a57f6e97b2747391c09224;hpb=97a33c4f51149dc19cc0d1e453f9473744022b04;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index f1c9a5cbe4..bc0d3682a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,11 +49,11 @@ endif
 BUILT_SOURCES = $(PCH_FILE)
 
 if USE_ASPELL
-ASPELL = ASpell.cpp ASpell_local.h
+ASPELL = AspellChecker.cpp AspellChecker.h
 endif
 
 if USE_HUNSPELL
-HUNSPELL = HunspellSpellChecker.cpp HunspellSpellChecker.h
+HUNSPELL = HunspellChecker.cpp HunspellChecker.h
 endif
 
 # These four objects are linked as object files as they are not
@@ -67,6 +67,8 @@ lyx_SOURCES = \
 	BiblioInfo.cpp \
 	Box.cpp \
 	Box.h \
+	Compare.cpp \
+	Compare.h \
 	Dimension.cpp \
 	Dimension.h \
 	$(HUNSPELL) \
@@ -116,6 +118,7 @@ SOURCEFILESCORE = \
 	FuncRequest.cpp \
 	FuncStatus.cpp \
 	Graph.cpp \
+	HSpace.cpp \
 	IndicesList.cpp \
 	InsetIterator.cpp \
 	InsetList.cpp \
@@ -146,7 +149,6 @@ SOURCEFILESCORE = \
 	OutputParams.cpp \
 	output_plaintext.cpp \
 	Paragraph.cpp \
-	paragraph_funcs.cpp \
 	ParagraphMetrics.cpp \
 	ParagraphParameters.cpp \
 	ParIterator.cpp \
@@ -216,6 +218,7 @@ HEADERFILESCORE = \
 	FuncRequest.h \
 	FuncStatus.h \
 	Graph.h \
+	HSpace.h \
 	IndicesList.h \
 	InsetIterator.h \
 	InsetList.h \
@@ -247,7 +250,6 @@ HEADERFILESCORE = \
 	OutputParams.h \
 	output_plaintext.h \
 	paper.h \
-	paragraph_funcs.h \
 	Paragraph.h \
 	ParagraphList.h \
 	ParagraphMetrics.h \
@@ -297,6 +299,27 @@ liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
 
 endif
 
+#########################  Qt stuff  ##############################
+
+MOCHEADER = Compare.h
+
+if INSTALL_WINDOWS
+
+MOCHEADER += Server.h
+MOCFLAG = -D_WIN32
+
+endif
+
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
+
+BUILT_SOURCES += $(MOCEDFILES)
+CLEANFILES += $(MOCEDFILES)
+
+moc_%.cpp: %.h
+	$(MOC4) $(MOCFLAG) -o $@ $<
+
+liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
+
 ############################### Graphics ##############################
 
 noinst_LIBRARIES += liblyxgraphics.a