Author: dmacvicar Date: Wed Feb 11 15:55:05 2009 New Revision: 55425 URL: http://svn.opensuse.org/viewcvs/yast?rev=55425&view=rev Log: remove hardcoded moc that broke with new qt Removed: trunk/devtools/y2logview/y2log_ana/moc_cgui.cc Modified: trunk/devtools/configure.in.in trunk/devtools/y2logview/y2log_ana/Makefile.am Modified: trunk/devtools/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/configure.in.in?rev=55425&r1=55424&r2=55425&view=diff ============================================================================== --- trunk/devtools/configure.in.in (original) +++ trunk/devtools/configure.in.in Wed Feb 11 15:55:05 2009 @@ -47,9 +47,13 @@ ## this is for y2log_ana pkg_modules="QtCore, QtGui, QtXml" -PKG_CHECK_MODULES(Qt4,[$pkg_modules],[qt=true],[AC_MSG_RESULT(not found)]) +PKG_CHECK_MODULES(Qt4, [$pkg_modules],[qt=true + MOC=`$PKG_CONFIG --variable=moc_location QtCore`], + [AC_MSG_RESULT(not found)]) AM_CONDITIONAL(CHECK_QT4, test "$qt" = "true") +AC_SUBST(MOC) + ## needed for documentation CHECK_PERL_MODULE(XML::Writer, XMLWRITER) if test "$XMLWRITER" = "false"; then Modified: trunk/devtools/y2logview/y2log_ana/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/y2logview/y2log_ana/Makefile.am?rev=55425&r1=55424&r2=55425&view=diff ============================================================================== --- trunk/devtools/y2logview/y2log_ana/Makefile.am (original) +++ trunk/devtools/y2logview/y2log_ana/Makefile.am Wed Feb 11 15:55:05 2009 @@ -21,4 +21,9 @@ y2log_ana_SOURCES = cgui.cc \ cman.cc \ cy2log.cc \ - moc_cgui.cc + cgui.moc.cc + +%.moc.cc: %.h + $(MOC) $< -o $@ + +CLEANFILES = *.moc.cpp -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org