diff options
-rw-r--r-- | liblightdm-qt/Makefile.am | 25 | ||||
-rw-r--r-- | tests/src/Makefile.am | 13 |
2 files changed, 26 insertions, 12 deletions
diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am index 70456b36..5889356d 100644 --- a/liblightdm-qt/Makefile.am +++ b/liblightdm-qt/Makefile.am @@ -1,15 +1,3 @@ -AM_V_MOC4 = $(am__v_MOC4_$(V)) -am__v_MOC4_ = $(am__v_MOC4_$(AM_DEFAULT_VERBOSITY)) -am__v_MOC4_0 = @echo " MOC4 " $@; -%_moc4.cpp: QLightDM/%.h - $(AM_V_MOC4) $(MOC4) $< -o $@ - -AM_V_MOC5 = $(am__v_MOC5_$(V)) -am__v_MOC5_ = $(am__v_MOC5_$(AM_DEFAULT_VERBOSITY)) -am__v_MOC5_0 = @echo " MOC5 " $@; -%_moc5.cpp: QLightDM/%.h - $(AM_V_MOC5) $(MOC5) $< -o $@ - common_libadd = \ -L$(top_builddir)/liblightdm-gobject \ -llightdm-gobject-1 @@ -85,3 +73,16 @@ liblightdm_qt5_3include_HEADERS = $(common_headers) BUILT_SOURCES += $(common_sources:.cpp=_moc5.cpp) pkgconfig_DATA += liblightdm-qt5-3.pc endif + +# Support pretty printing MOC +AM_V_MOC4 = $(am__v_MOC4_$(V)) +am__v_MOC4_ = $(am__v_MOC4_$(AM_DEFAULT_VERBOSITY)) +am__v_MOC4_0 = @echo " MOC4 " $@; +%_moc4.cpp: QLightDM/%.h + $(AM_V_MOC4) $(MOC4) $< -o $@ + +AM_V_MOC5 = $(am__v_MOC5_$(V)) +am__v_MOC5_ = $(am__v_MOC5_$(AM_DEFAULT_VERBOSITY)) +am__v_MOC5_0 = @echo " MOC5 " $@; +%_moc5.cpp: QLightDM/%.h + $(AM_V_MOC5) $(MOC5) $< -o $@ diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am index 586059b2..cc25269b 100644 --- a/tests/src/Makefile.am +++ b/tests/src/Makefile.am @@ -184,3 +184,16 @@ vnc_client_LDADD = \ CLEANFILES = \ test-qt4-greeter_moc4.cpp \ test-qt5-greeter_moc5.cpp + +# Support pretty printing MOC +AM_V_MOC4 = $(am__v_MOC4_$(V)) +am__v_MOC4_ = $(am__v_MOC4_$(AM_DEFAULT_VERBOSITY)) +am__v_MOC4_0 = @echo " MOC4 " $@; +%_moc4.cpp: QLightDM/%.h + $(AM_V_MOC4) $(MOC4) $< -o $@ + +AM_V_MOC5 = $(am__v_MOC5_$(V)) +am__v_MOC5_ = $(am__v_MOC5_$(AM_DEFAULT_VERBOSITY)) +am__v_MOC5_0 = @echo " MOC5 " $@; +%_moc5.cpp: QLightDM/%.h + $(AM_V_MOC5) $(MOC5) $< -o $@ |