From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 7 Feb 2008 13:45:40 +0000 (+0000)
Subject: * do not pass headers without Q_OBJECT through moc
X-Git-Tag: 1.6.10~6405
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b21b3b346dde4ff2939e977257dd642d37f64e0b;p=features.git

* do not pass headers without Q_OBJECT through moc

* make sure Resource.* files are cleaned as needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22834 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index e3df761f0d..4a054ad3ba 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -1,12 +1,11 @@
 include $(top_srcdir)/config/common.am
 
-CLEANFILES += $(UIFILES:%.ui=ui_%.h)
-CLEANFILES += $(MOCEDFILES)
-
 BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h)
 BUILT_SOURCES += $(MOCEDFILES)
 BUILT_SOURCES += Resources.cpp Resources.qrc
 
+CLEANFILES += $(BUILT_SOURCES)
+
 #########################  Qt stuff  #############################
 # Use _() for localization instead of tr() or trUtf8()
 UIC4FLAGS=-tr lyx::qt_
@@ -137,22 +136,27 @@ SOURCEFILES = \
 
 NOMOCHEADER = \
 	ButtonController.h \
+	ColorCache.h \
+	DockView.h \
 	FileDialog.h \
+	GuiFontExample.h \
 	GuiFontLoader.h \
 	GuiFontMetrics.h \
+	GuiIdListModel.h \
 	GuiImage.h \
+	GuiKeySymbol.h \
 	GuiMath.h \
 	GuiPainter.h \
 	GuiToolbars.h \
+	LaTeXHighlighter.h \
+	qlkey.h \
 	qt_helpers.h
 
 MOCHEADER = \
 	Action.h \
 	BulletsModule.h \
-	ColorCache.h \
 	CustomizedWidgets.h \
 	DialogView.h \
-	DockView.h \
 	EmptyTable.h \
 	FloatPlacement.h \
 	GuiAbout.h \
@@ -175,13 +179,10 @@ MOCHEADER = \
 	GuiERT.h \
 	GuiExternal.h \
 	GuiFloat.h \
-	GuiFontExample.h \
 	GuiGraphics.h \
 	GuiHyperlink.h \
-	GuiIdListModel.h \
 	GuiInclude.h \
 	GuiIndex.h \
-	GuiKeySymbol.h \
 	GuiListings.h \
 	GuiLog.h \
 	GuiMathMatrix.h \
@@ -215,10 +216,8 @@ MOCHEADER = \
 	InsertTableWidget.h \
 	LengthCombo.h \
 	LyXFileDialog.h \
-	LaTeXHighlighter.h \
 	Menus.h \
 	PanelStack.h \
-	qlkey.h \
 	TocModel.h \
 	TocWidget.h \
 	Validator.h