X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FMakefile.am;h=66a86bb227f695c2c7077be66f3ff49b987877e9;hb=1f10969bb5c5f36017bf5ba8671381b09945cf57;hp=5473e393f1fc4f1b96bcbdc0044cd16850b78206;hpb=69a993312db5c4cdc18a63b04944ed4d3b9c99c9;p=lyx.git

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 5473e393f1..66a86bb227 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -4,34 +4,34 @@ BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h)
 BUILT_SOURCES += $(MOCEDFILES)
 BUILT_SOURCES += Resources.cpp Resources.qrc
 
-CLEANFILES += $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES)
 
 #########################  Qt stuff  #############################
 # Use _() for localization instead of tr() or trUtf8()
-UIC4FLAGS=-tr lyx::qt_
+UICFLAGS=-tr lyx::qt_
 
 # The ui_%.h pattern must match the filter in ../../../po/Rules-lyx
 ui_%.h: ui/%.ui
-	$(AM_V_GEN)$(UIC4) $(UIC4FLAGS) $< -o $@
+	$(AM_V_GEN)$(QT_UIC) $(UICFLAGS) $< -o $@
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
-QT_VERSION = $(shell IFS=.; set -- `echo $(QT4_VERSION)`; \
+QT_VERSION = $(shell IFS=.; set -- `echo $(QTLIB_VERSION)`; \
 	     echo 0x0`echo "obase=16; $$1*65536+$$2*256+$$3" | bc`)
 
 # The moc_%.cpp pattern must match the filter in ../../../po/Rules-lyx
 moc_%.cpp: %.h
-	$(AM_V_GEN)$(MOC4) -DQT_VERSION=$(QT_VERSION) -o $@ $<
+	$(AM_V_GEN)$(QT_MOC) -DQT_VERSION=$(QT_VERSION) -o $@ $<
 
 Resources.qrc: Makefile
 	$(AM_V_GEN)echo "<!DOCTYPE RCC><RCC version='1.0'><qresource>" > $@ ; \
-	find $(top_srcdir)/lib/images -name '*.png' -o -name '*.gif' \
+	find $(top_srcdir)/lib/images -name '*.svgz' -o -name '*.png' -o -name '*.gif' \
 		| sed -e 's:$(top_srcdir)/lib/\(.*\):<file alias="\1">&</file>:' \
 		>> $@ ;\
 	echo "</qresource></RCC>" >> $@
 
 Resources.cpp: Resources.qrc
-	$(AM_V_GEN)$(RCC4) $< -name Resources -o $@
+	$(AM_V_GEN)$(QT_RCC) $< -name Resources -o $@
 
 
 #########################  LIBRARIES  #############################
@@ -41,25 +41,28 @@ noinst_LIBRARIES = liblyxqt4.a
 liblyxqt4_a_DEPENDENCIES = $(MOCEDFILES)
 
 AM_CPPFLAGS += \
-	$(QT4_CPPFLAGS) \
+	$(QT_CPPFLAGS) \
 	-DQT_NO_CAST_TO_ASCII \
 	-DQT_NO_STL \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/frontends \
 	-I$(top_srcdir)/images \
-	$(QT4_INCLUDES) $(BOOST_INCLUDES)
+	$(QT_INCLUDES) \
+	$(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
 
 SOURCEFILES = \
 	ButtonPolicy.cpp \
 	ButtonPolicy.h \
 	Dialog.cpp \
 	Dialog.h \
-	Resources.cpp \
 	Action.cpp \
 	BulletsModule.cpp \
 	ButtonController.cpp \
+	CategorizedCombo.cpp \
 	ColorCache.cpp \
 	CustomizedWidgets.cpp \
+	DialogView.cpp \
+	DockView.cpp \
 	EmptyTable.cpp \
 	FancyLineEdit.cpp \
 	FileDialog.cpp \
@@ -112,7 +115,6 @@ SOURCEFILES = \
 	GuiParagraph.cpp \
 	GuiPhantom.cpp \
 	GuiPrefs.cpp \
-	GuiPrint.cpp \
 	GuiPrintindex.cpp \
 	GuiPrintNomencl.cpp \
 	GuiProgress.cpp \
@@ -152,13 +154,12 @@ SOURCEFILES = \
 	TocModel.cpp \
 	TocWidget.cpp \
 	Toolbars.cpp \
+	ToolTipFormatter.cpp \
 	Validator.cpp 
 
 NOMOCHEADER = \
 	ButtonController.h \
 	ColorCache.h \
-	DialogView.h \
-	DockView.h \
 	FileDialog.h \
 	GuiFontExample.h \
 	GuiFontLoader.h \
@@ -176,7 +177,10 @@ NOMOCHEADER = \
 MOCHEADER = \
 	Action.h \
 	BulletsModule.h \
+	CategorizedCombo.h \
 	CustomizedWidgets.h \
+	DialogView.h \
+	DockView.h \
 	EmptyTable.h \
 	FancyLineEdit.h \
 	FindAndReplace.h \
@@ -220,7 +224,6 @@ MOCHEADER = \
 	GuiParagraph.h \
 	GuiPhantom.h \
 	GuiPrefs.h \
-	GuiPrint.h \
 	GuiPrintindex.h \
 	GuiPrintNomencl.h \
 	GuiProgress.h \
@@ -257,6 +260,7 @@ MOCHEADER = \
 	PanelStack.h \
 	TocModel.h \
 	TocWidget.h \
+	ToolTipFormatter.h \
 	Validator.h
 
 UIFILES = \
@@ -317,6 +321,7 @@ UIFILES = \
 	PrefColorsUi.ui \
 	PrefCompletionUi.ui \
 	PrefConvertersUi.ui \
+	PrefDocHandlingUi.ui \
 	PrefOutputUi.ui \
 	PrefDisplayUi.ui \
 	PrefEditUi.ui \
@@ -326,13 +331,11 @@ UIFILES = \
 	PrefLanguageUi.ui \
 	PrefLatexUi.ui \
 	PrefPathsUi.ui \
-	PrefPrinterUi.ui \
 	PrefScreenFontsUi.ui \
 	PrefShortcutsUi.ui \
 	PrefSpellcheckerUi.ui \
 	PrefsUi.ui \
 	PrefUi.ui \
-	PrintUi.ui \
 	PrintindexUi.ui \
 	PrintNomenclUi.ui \
 	ProgressViewUi.ui \
@@ -354,14 +357,15 @@ UIFILES = \
 	VSpaceUi.ui \
 	WrapUi.ui
 
+nodist_liblyxqt4_a_SOURCES = Resources.cpp
 
 liblyxqt4.cpp:
-	@echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
+	$(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@
 
-if MONOLITHIC_FRONTEND_QT4
+if MONOLITHIC_FRONTEND_QT
 
+nodist_liblyxqt4_a_SOURCES += liblyxqt4.cpp
 liblyxqt4_a_SOURCES = \
-	liblyxqt4.cpp \
 	$(MOCHEADER) \
 	$(NOMOCHEADER)
 
@@ -375,9 +379,6 @@ liblyxqt4_a_SOURCES = \
 	$(MOCHEADER) \
 	$(NOMOCHEADER)
 
-EXTRA_DIST = pch.h $(UIFILES:%=ui/%)
-BUILT_SOURCES += $(PCH_FILE)
-AM_CPPFLAGS += $(PCH_FLAGS)
-
-
 endif
+
+EXTRA_DIST = CMakeLists.txt $(UIFILES:%=ui/%)