From c06ea24affe6d21bdf91ba5dba2249603f9ca0d5 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 14 Feb 2013 10:00:00 +0000 Subject: [PATCH] Fix build procedure broken after previous integration --- tools/dlgfactory/Makefile.am | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/dlgfactory/Makefile.am b/tools/dlgfactory/Makefile.am index 9f6021b85..70b1c5b30 100644 --- a/tools/dlgfactory/Makefile.am +++ b/tools/dlgfactory/Makefile.am @@ -20,12 +20,16 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am +# meta object implementation files generation (moc) +%_moc.cxx: %.hxx + $(MOC) $(MOC_FLAGS) $< -o $@ + # Program targets bin_PROGRAMS = qtester gtester # QDialog uic files UIC_FILES_QDIALOG = \ - ui_QDialogTest.hxx + ui_QDialogTest.h # QDialog moc files MOC_FILES_QDIALOG = \ @@ -33,8 +37,8 @@ MOC_FILES_QDIALOG = \ # GDialog uic files UIC_FILES_GDIALOG= \ - ui_GenericDialog.hxx \ - ui_GDialogTest.hxx + ui_GenericDialog.h \ + ui_GDialogTest.h # GDialog moc files MOC_FILES_GDIALOG= \ @@ -43,6 +47,8 @@ MOC_FILES_GDIALOG= \ QDIALOG_TEMPLATES = __QDIALOG__.ui __QDIALOG__.hxx __QDIALOG__.cxx GDIALOG_TEMPLATES = __GDIALOG__.ui __GDIALOG__.hxx __GDIALOG__.cxx +QDIALOG_FILES = QDialogTest.hxx QDialogTest.cxx QDialogTest.ui +GDIALOG_FILES = GDialogTest.hxx GDialogTest.cxx GDialogTest.ui # generated sources BUILT_SOURCES = $(UIC_FILES_QDIALOG) $(UIC_FILES_GDIALOG) @@ -51,14 +57,13 @@ BUILT_SOURCES = $(UIC_FILES_QDIALOG) $(UIC_FILES_GDIALOG) EXTRA_DIST += $(QDIALOG_TEMPLATES) $(GDIALOG_TEMPLATES) GenericDialog.ui README.txt dlgfactory.py mostlyclean-local: - rm @builddir@/QDialogTest* - rm @builddir@/GDialogTest* - rm -f @builddir@/*_moc.cxx @builddir@/ui_*.hxx + rm -f $(QDIALOG_FILES) $(GDIALOG_FILES) + rm -f @builddir@/*_moc.cxx @builddir@/ui_*.h -QDialogTest.hxx QDialogTest.cxx QDialogTest.ui: $(QDIALOG_TEMPLATES) dlgfactory.py +$(QDIALOG_FILES): $(QDIALOG_TEMPLATES) dlgfactory.py $(srcdir)/dlgfactory.py -s -n QDialogTest -t qdialog -GDialogTest.hxx GDialogTest.cxx GDialogTest.ui : $(GDIALOG_TEMPLATES) dlgfactory.py +$(GDIALOG_FILES): $(GDIALOG_TEMPLATES) dlgfactory.py $(srcdir)/dlgfactory.py -s -n GDialogTest -t gdialog QT_CXXFLAGS=@QT_INCLUDES@ @QT_MT_INCLUDES@ -- 2.39.2