don't stop if qt is not found; more elegant way for adding qt rules

master
Marc Wäckerlin 10 years ago
parent 0be9cb0b09
commit 8ef29e4e0c
  1. 9
      m4/ax_check_qt.m4
  2. 6
      src/makefile.am

@ -79,9 +79,16 @@ AC_DEFUN([AX_CXX_CHECK_QT], [
AM_CPPFLAGS+=" ${$1_CFLAGS}" AM_CPPFLAGS+=" ${$1_CFLAGS}"
AM_CXXFLAGS+=" ${$1_CFLAGS}" AM_CXXFLAGS+=" ${$1_CFLAGS}"
LIBS+=" ${$1_LIBS}" LIBS+=" ${$1_LIBS}"
]) ], [HAVE_$1=0])
]) ])
AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1) AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_CXXFLAGS) AC_SUBST(AM_CXXFLAGS)
AM_QT_RULES='
%_ui.hxx: %.ui
${UIC} -o [$][@] $<
moc_%.cxx: %.hxx
${MOC} -o [$][@] $<'
AC_SUBST(QT_RULES)
]) ])

@ -58,12 +58,6 @@ endif
noinst_PROGRAMS = versiontest noinst_PROGRAMS = versiontest
versiontest_SOURCES = versiontest.cxx versiontest_SOURCES = versiontest.cxx
%_ui.hxx: %.ui
@UIC@ -o $@ $<
moc_%.cxx: %.hxx
@MOC@ -o $@ $<
clean-local: clean-local:
-rm -r ${QMAKE_TARGET}.app -rm -r ${QMAKE_TARGET}.app

Loading…
Cancel
Save