diff options
| author | BobMauchin <zebob.m@gmail.com> | 2011-10-10 21:48:48 -0400 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2011-10-10 21:48:48 -0400 |
| commit | 5d892318115d7c9f48c9473779585e4abd3574d7 (patch) | |
| tree | a3211c2b90a74e310eec807d407f86630ebb5615 | |
| parent | 32b10d205db7dd05c4fe66407e03159f9d000a82 (diff) | |
| download | lightdm-5d892318115d7c9f48c9473779585e4abd3574d7.tar.gz | |
Update build system to find moc/uic
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | greeters/qt/Makefile.am | 10 | ||||
| -rw-r--r-- | liblightdm-qt/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/src/Makefile.am | 2 |
5 files changed, 17 insertions, 9 deletions
@@ -1,6 +1,8 @@ Overview of changes in lightdm 1.1.1 * Add a --disable-tests option + * Add note to AUTHORS file where to find author list + * Update build system to find moc/uic Overview of changes in lightdm 1.1.0 diff --git a/configure.ac b/configure.ac index bf23dd85..8dc8d07f 100644 --- a/configure.ac +++ b/configure.ac @@ -88,12 +88,18 @@ if test x"$enable_liblightdm_qt" = "xauto"; then QtNetwork QtGui ], compile_liblightdm_qt=yes, compile_liblightdm_qt=no) + QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir` + AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH]) + AC_CHECK_TOOLS(UIC, [uic-qt4 uic],, [$QT4_BINDIR:$PATH]) elif test x"$enable_liblightdm_qt" = "xyes"; then PKG_CHECK_MODULES(LIBLIGHTDM_QT, [ QtCore QtDBus QtNetwork ]) + QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir` + AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH]) + AC_CHECK_TOOLS(UIC, [uic-qt4 uic],, [$QT4_BINDIR:$PATH]) compile_liblightdm_qt=yes fi AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT, test x"$compile_liblightdm_qt" != "xno") diff --git a/greeters/qt/Makefile.am b/greeters/qt/Makefile.am index 2747dff2..b47cd70a 100644 --- a/greeters/qt/Makefile.am +++ b/greeters/qt/Makefile.am @@ -4,16 +4,16 @@ xgreetersdir = $(datadir)/xgreeters dist_xgreeters_DATA = lightdm-qt-greeter.desktop greeter_moc.cpp: greeter.h - moc $< -o $@ + $(MOC) $< -o $@ loginprompt_moc.cpp: loginprompt.h - moc $< -o $@ + $(MOC) $< -o $@ panel_moc.cpp: panel.h - moc $< -o $@ + $(MOC) $< -o $@ ui_loginprompt.h: loginprompt.ui - uic $< -o $@ + $(UIC) $< -o $@ ui_panel.h: panel.ui - uic $< -o $@ + $(UIC) $< -o $@ loginprompt.cpp: ui_loginprompt.h panel.cpp: ui_panel.h diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am index a325018a..dbd8c3a5 100644 --- a/liblightdm-qt/Makefile.am +++ b/liblightdm-qt/Makefile.am @@ -7,11 +7,11 @@ MOC_FILES = \ user_moc.cpp greeter_moc.cpp: QLightDM/Greeter - moc $< -o $@ + $(MOC) $< -o $@ session_moc.cpp: QLightDM/Session - moc $< -o $@ + $(MOC) $< -o $@ user_moc.cpp: QLightDM/User - moc $< -o $@ + $(MOC) $< -o $@ liblightdm_qt_1_la_LIBADD = $(LIBLIGHTDM_QT_LIBS) liblightdm_qt_1_la_CXXFLAGS = $(LIBLIGHTDM_QT_CFLAGS) \ diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am index db02ae26..0d172cc1 100644 --- a/tests/src/Makefile.am +++ b/tests/src/Makefile.am @@ -62,7 +62,7 @@ test_script_hook_LDADD = \ $(GLIB_LIBS) test-qt-greeter_moc.cpp: test-qt-greeter.h - moc $< -o $@ + $(MOC) $< -o $@ test_qt_greeter_SOURCES = test-qt-greeter.cpp test-qt-greeter.h test-qt-greeter_moc.cpp status.c status.h test_qt_greeter_CXXFLAGS = \ -I$(top_srcdir)/liblightdm-qt \ |