From: APTX Date: Fri, 6 Apr 2012 15:36:35 +0000 (-0400) Subject: moc-qt4 -> moc X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=4f8c509640834e015a78e77f94ad01c111323751;p=libferris.git moc-qt4 -> moc --- diff --git a/DBusGlue/Makefile.am b/DBusGlue/Makefile.am index dfa36c4..a69d3a9 100644 --- a/DBusGlue/Makefile.am +++ b/DBusGlue/Makefile.am @@ -22,43 +22,43 @@ BUILT_SOURCES = broker_adaptor.h broker_adaptor.cpp broker_interface.h broker_in broker_adaptor.h broker_adaptor.cpp broker_interface.h broker_interface.cpp: ferris_internal_metadata_broker_introspect.xml qdbusxml2cpp -N -m -c broker -p broker_interface $(srcdir)/ferris_internal_metadata_broker_introspect.xml - moc-qt4 broker_interface.h -o broker_interface.moc + moc broker_interface.h -o broker_interface.moc qdbusxml2cpp -N -m -c broker -a broker_adaptor $(srcdir)/ferris_internal_metadata_broker_introspect.xml - moc-qt4 broker_adaptor.h -o broker_adaptor.moc + moc broker_adaptor.h -o broker_adaptor.moc worker_adaptor.h worker_adaptor.cpp worker_interface.h worker_interface.cpp: ferris_internal_metadata_worker_introspect.xml qdbusxml2cpp -N -m -c worker -p worker_interface $(srcdir)/ferris_internal_metadata_worker_introspect.xml - moc-qt4 worker_interface.h -o worker_interface.moc + moc worker_interface.h -o worker_interface.moc qdbusxml2cpp -N -m -c worker -a worker_adaptor $(srcdir)/ferris_internal_metadata_worker_introspect.xml - moc-qt4 worker_adaptor.h -o worker_adaptor.moc + moc worker_adaptor.h -o worker_adaptor.moc org_freedesktop_DBus.h org_freedesktop_DBus.cpp: org.freedesktop.DBus.xml qdbusxml2cpp -N -m -c fdoDBus -p org_freedesktop_DBus $(srcdir)/org.freedesktop.DBus.xml - moc-qt4 org_freedesktop_DBus.h -o org_freedesktop_DBus.moc + moc org_freedesktop_DBus.h -o org_freedesktop_DBus.moc org_freedesktop_DBus_Introspectable.h org_freedesktop_DBus_Introspectable.cpp: org.freedesktop.DBus.Introspectable.xml qdbusxml2cpp -N -m -c fdoDBusIntrospectable -p org_freedesktop_DBus_Introspectable $(srcdir)/org.freedesktop.DBus.Introspectable.xml - moc-qt4 org_freedesktop_DBus_Introspectable.h -o org_freedesktop_DBus_Introspectable.moc + moc org_freedesktop_DBus_Introspectable.h -o org_freedesktop_DBus_Introspectable.moc org_freedesktop_Hal_Device.h org_freedesktop_Hal_Device.cpp: org.freedesktop.Hal.Device.xml qdbusxml2cpp -N -m -c fdoHalDevice -p org_freedesktop_Hal_Device $(srcdir)/org.freedesktop.Hal.Device.xml - moc-qt4 org_freedesktop_Hal_Device.h -o org_freedesktop_Hal_Device.moc + moc org_freedesktop_Hal_Device.h -o org_freedesktop_Hal_Device.moc org_freedesktop_Hal_Device_Volume.h org_freedesktop_Hal_Device_Volume.cpp: org.freedesktop.Hal.Device.Volume.xml qdbusxml2cpp -N -m -c fdoHalDeviceVolume -p org_freedesktop_Hal_Device_Volume $(srcdir)/org.freedesktop.Hal.Device.Volume.xml - moc-qt4 org_freedesktop_Hal_Device_Volume.h -o org_freedesktop_Hal_Device_Volume.moc + moc org_freedesktop_Hal_Device_Volume.h -o org_freedesktop_Hal_Device_Volume.moc org_freedesktop_Hal_Manager.h org_freedesktop_Hal_Manager.cpp: org.freedesktop.Hal.Manager.xml qdbusxml2cpp -N -m -c fdoHalManager -p org_freedesktop_Hal_Manager $(srcdir)/org.freedesktop.Hal.Manager.xml - moc-qt4 org_freedesktop_Hal_Manager.h -o org_freedesktop_Hal_Manager.moc + moc org_freedesktop_Hal_Manager.h -o org_freedesktop_Hal_Manager.moc com_libferris_Volume_Manager.h com_libferris_Volume_Manager.cpp com_libferris_Volume_Manager_adaptor.h com_libferris_Volume_Manager_adaptor.cpp: com.libferris.Volume.Manager.xml qdbusxml2cpp -N -m -c fVolumeManager -p com_libferris_Volume_Manager $(srcdir)/com.libferris.Volume.Manager.xml - moc-qt4 com_libferris_Volume_Manager.h -o com_libferris_Volume_Manager.moc + moc com_libferris_Volume_Manager.h -o com_libferris_Volume_Manager.moc qdbusxml2cpp -N -m -c fVolumeManager -a com_libferris_Volume_Manager_adaptor $(srcdir)/com.libferris.Volume.Manager.xml - moc-qt4 com_libferris_Volume_Manager_adaptor.h -o com_libferris_Volume_Manager_adaptor.moc + moc com_libferris_Volume_Manager_adaptor.h -o com_libferris_Volume_Manager_adaptor.moc diff --git a/DBusGlue/Makefile.in b/DBusGlue/Makefile.in index f8f01d7..500a1f6 100644 --- a/DBusGlue/Makefile.in +++ b/DBusGlue/Makefile.in @@ -1069,41 +1069,41 @@ uninstall-am: uninstall-serviceDATA broker_adaptor.h broker_adaptor.cpp broker_interface.h broker_interface.cpp: ferris_internal_metadata_broker_introspect.xml qdbusxml2cpp -N -m -c broker -p broker_interface $(srcdir)/ferris_internal_metadata_broker_introspect.xml - moc-qt4 broker_interface.h -o broker_interface.moc + moc broker_interface.h -o broker_interface.moc qdbusxml2cpp -N -m -c broker -a broker_adaptor $(srcdir)/ferris_internal_metadata_broker_introspect.xml - moc-qt4 broker_adaptor.h -o broker_adaptor.moc + moc broker_adaptor.h -o broker_adaptor.moc worker_adaptor.h worker_adaptor.cpp worker_interface.h worker_interface.cpp: ferris_internal_metadata_worker_introspect.xml qdbusxml2cpp -N -m -c worker -p worker_interface $(srcdir)/ferris_internal_metadata_worker_introspect.xml - moc-qt4 worker_interface.h -o worker_interface.moc + moc worker_interface.h -o worker_interface.moc qdbusxml2cpp -N -m -c worker -a worker_adaptor $(srcdir)/ferris_internal_metadata_worker_introspect.xml - moc-qt4 worker_adaptor.h -o worker_adaptor.moc + moc worker_adaptor.h -o worker_adaptor.moc org_freedesktop_DBus.h org_freedesktop_DBus.cpp: org.freedesktop.DBus.xml qdbusxml2cpp -N -m -c fdoDBus -p org_freedesktop_DBus $(srcdir)/org.freedesktop.DBus.xml - moc-qt4 org_freedesktop_DBus.h -o org_freedesktop_DBus.moc + moc org_freedesktop_DBus.h -o org_freedesktop_DBus.moc org_freedesktop_DBus_Introspectable.h org_freedesktop_DBus_Introspectable.cpp: org.freedesktop.DBus.Introspectable.xml qdbusxml2cpp -N -m -c fdoDBusIntrospectable -p org_freedesktop_DBus_Introspectable $(srcdir)/org.freedesktop.DBus.Introspectable.xml - moc-qt4 org_freedesktop_DBus_Introspectable.h -o org_freedesktop_DBus_Introspectable.moc + moc org_freedesktop_DBus_Introspectable.h -o org_freedesktop_DBus_Introspectable.moc org_freedesktop_Hal_Device.h org_freedesktop_Hal_Device.cpp: org.freedesktop.Hal.Device.xml qdbusxml2cpp -N -m -c fdoHalDevice -p org_freedesktop_Hal_Device $(srcdir)/org.freedesktop.Hal.Device.xml - moc-qt4 org_freedesktop_Hal_Device.h -o org_freedesktop_Hal_Device.moc + moc org_freedesktop_Hal_Device.h -o org_freedesktop_Hal_Device.moc org_freedesktop_Hal_Device_Volume.h org_freedesktop_Hal_Device_Volume.cpp: org.freedesktop.Hal.Device.Volume.xml qdbusxml2cpp -N -m -c fdoHalDeviceVolume -p org_freedesktop_Hal_Device_Volume $(srcdir)/org.freedesktop.Hal.Device.Volume.xml - moc-qt4 org_freedesktop_Hal_Device_Volume.h -o org_freedesktop_Hal_Device_Volume.moc + moc org_freedesktop_Hal_Device_Volume.h -o org_freedesktop_Hal_Device_Volume.moc org_freedesktop_Hal_Manager.h org_freedesktop_Hal_Manager.cpp: org.freedesktop.Hal.Manager.xml qdbusxml2cpp -N -m -c fdoHalManager -p org_freedesktop_Hal_Manager $(srcdir)/org.freedesktop.Hal.Manager.xml - moc-qt4 org_freedesktop_Hal_Manager.h -o org_freedesktop_Hal_Manager.moc + moc org_freedesktop_Hal_Manager.h -o org_freedesktop_Hal_Manager.moc com_libferris_Volume_Manager.h com_libferris_Volume_Manager.cpp com_libferris_Volume_Manager_adaptor.h com_libferris_Volume_Manager_adaptor.cpp: com.libferris.Volume.Manager.xml qdbusxml2cpp -N -m -c fVolumeManager -p com_libferris_Volume_Manager $(srcdir)/com.libferris.Volume.Manager.xml - moc-qt4 com_libferris_Volume_Manager.h -o com_libferris_Volume_Manager.moc + moc com_libferris_Volume_Manager.h -o com_libferris_Volume_Manager.moc qdbusxml2cpp -N -m -c fVolumeManager -a com_libferris_Volume_Manager_adaptor $(srcdir)/com.libferris.Volume.Manager.xml - moc-qt4 com_libferris_Volume_Manager_adaptor.h -o com_libferris_Volume_Manager_adaptor.moc + moc com_libferris_Volume_Manager_adaptor.h -o com_libferris_Volume_Manager_adaptor.moc # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Ferris/Makefile.am b/Ferris/Makefile.am index e0aa38e..cca5742 100644 --- a/Ferris/Makefile.am +++ b/Ferris/Makefile.am @@ -1,8 +1,8 @@ %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # have to make these! # FerrisWebServices_private_moc.cpp FerrisQt_moc_impl.cpp diff --git a/Ferris/Makefile.in b/Ferris/Makefile.in index 1b6c83a..40fefc8 100644 --- a/Ferris/Makefile.in +++ b/Ferris/Makefile.in @@ -1826,10 +1826,10 @@ uninstall-am: uninstall-ferrisincludeHEADERS uninstall-libLTLIBRARIES \ uninstall-pythonmoduleDATA %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # have to make these! # FerrisWebServices_private_moc.cpp FerrisQt_moc_impl.cpp diff --git a/FerrisQtGui/Makefile.am b/FerrisQtGui/Makefile.am index fa84f38..46c94cc 100644 --- a/FerrisQtGui/Makefile.am +++ b/FerrisQtGui/Makefile.am @@ -23,10 +23,10 @@ EXTRA_DIST = $(srcdir)/*.qml ################################################################### %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: FerrisFileSystemModel_moc.cpp FerrisSortFilterProxyModel_moc.cpp modeltest_moc_impl.cpp touch mocimpls.cpp diff --git a/FerrisQtGui/Makefile.in b/FerrisQtGui/Makefile.in index e89a969..f5da6ef 100644 --- a/FerrisQtGui/Makefile.in +++ b/FerrisQtGui/Makefile.in @@ -1082,10 +1082,10 @@ uninstall-am: uninstall-ferrisqtguiincludeHEADERS \ ################################################################### %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: FerrisFileSystemModel_moc.cpp FerrisSortFilterProxyModel_moc.cpp modeltest_moc_impl.cpp touch mocimpls.cpp diff --git a/apps/metadataserver/Makefile.am b/apps/metadataserver/Makefile.am index 23280fd..ffab881 100644 --- a/apps/metadataserver/Makefile.am +++ b/apps/metadataserver/Makefile.am @@ -11,16 +11,16 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp ferris-internal-metadata-broker.moc: ferris-internal-metadata-broker.cpp - moc-qt4 $(srcdir)/ferris-internal-metadata-broker.cpp -o ferris-internal-metadata-broker.moc + moc $(srcdir)/ferris-internal-metadata-broker.cpp -o ferris-internal-metadata-broker.moc ferris-internal-metadata-worker.moc: ferris-internal-metadata-worker.cpp - moc-qt4 $(srcdir)/ferris-internal-metadata-worker.cpp -o ferris-internal-metadata-worker.moc + moc $(srcdir)/ferris-internal-metadata-worker.cpp -o ferris-internal-metadata-worker.moc ferris-internal-metadata-broker-direct-client.moc: ferris-internal-metadata-broker-direct-client.cpp - moc-qt4 $(srcdir)/ferris-internal-metadata-broker-direct-client.cpp -o ferris-internal-metadata-broker-direct-client.moc + moc $(srcdir)/ferris-internal-metadata-broker-direct-client.cpp -o ferris-internal-metadata-broker-direct-client.moc metadata-clients-common.moc: metadata-clients-common.cpp - moc-qt4 $(srcdir)/metadata-clients-common.hh -o metadata-clients-common.moc + moc $(srcdir)/metadata-clients-common.hh -o metadata-clients-common.moc INCLUDES = \ @STLPORT_CFLAGS@ \ diff --git a/apps/metadataserver/Makefile.in b/apps/metadataserver/Makefile.in index e55f0d4..e2ec06e 100644 --- a/apps/metadataserver/Makefile.in +++ b/apps/metadataserver/Makefile.in @@ -1093,16 +1093,16 @@ uninstall-am: uninstall-binPROGRAMS @HAVE_QTDBUS_TRUE@mocimpls.cpp: $(MOC_DEP_SRCS) @HAVE_QTDBUS_TRUE@ touch mocimpls.cpp @HAVE_QTDBUS_TRUE@ferris-internal-metadata-broker.moc: ferris-internal-metadata-broker.cpp -@HAVE_QTDBUS_TRUE@ moc-qt4 $(srcdir)/ferris-internal-metadata-broker.cpp -o ferris-internal-metadata-broker.moc +@HAVE_QTDBUS_TRUE@ moc $(srcdir)/ferris-internal-metadata-broker.cpp -o ferris-internal-metadata-broker.moc @HAVE_QTDBUS_TRUE@ferris-internal-metadata-worker.moc: ferris-internal-metadata-worker.cpp -@HAVE_QTDBUS_TRUE@ moc-qt4 $(srcdir)/ferris-internal-metadata-worker.cpp -o ferris-internal-metadata-worker.moc +@HAVE_QTDBUS_TRUE@ moc $(srcdir)/ferris-internal-metadata-worker.cpp -o ferris-internal-metadata-worker.moc @HAVE_QTDBUS_TRUE@ferris-internal-metadata-broker-direct-client.moc: ferris-internal-metadata-broker-direct-client.cpp -@HAVE_QTDBUS_TRUE@ moc-qt4 $(srcdir)/ferris-internal-metadata-broker-direct-client.cpp -o ferris-internal-metadata-broker-direct-client.moc +@HAVE_QTDBUS_TRUE@ moc $(srcdir)/ferris-internal-metadata-broker-direct-client.cpp -o ferris-internal-metadata-broker-direct-client.moc @HAVE_QTDBUS_TRUE@metadata-clients-common.moc: metadata-clients-common.cpp -@HAVE_QTDBUS_TRUE@ moc-qt4 $(srcdir)/metadata-clients-common.hh -o metadata-clients-common.moc +@HAVE_QTDBUS_TRUE@ moc $(srcdir)/metadata-clients-common.hh -o metadata-clients-common.moc # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/exposures/plasma/Makefile.am b/exposures/plasma/Makefile.am index 922bfb5..dda3f69 100644 --- a/exposures/plasma/Makefile.am +++ b/exposures/plasma/Makefile.am @@ -11,7 +11,7 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ INCLUDES = \ @STLPORT_CFLAGS@ \ diff --git a/exposures/plasma/Makefile.in b/exposures/plasma/Makefile.in index 0db8b28..64de13f 100644 --- a/exposures/plasma/Makefile.in +++ b/exposures/plasma/Makefile.in @@ -1061,7 +1061,7 @@ uninstall-am: uninstall-desktopDATA uninstall-operationsDATA \ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/amarok/Makefile.am b/plugins/context/amarok/Makefile.am index a44eb71..98186f2 100644 --- a/plugins/context/amarok/Makefile.am +++ b/plugins/context/amarok/Makefile.am @@ -7,11 +7,11 @@ BUILT_SOURCES = player_interface.cpp player_interface.h tracklist_interface.cpp player_interface.cpp player_interface.h: player_interface.xml qdbusxml2cpp -N -m -i dbus-extra-types.hh -c player -p player_interface $(srcdir)/player_interface.xml - moc-qt4 player_interface.h -o player_interface.moc + moc player_interface.h -o player_interface.moc tracklist_interface.cpp tracklist_interface.h: tracklist_interface.xml qdbusxml2cpp -N -m -c tracklist -p tracklist_interface $(srcdir)/tracklist_interface.xml - moc-qt4 tracklist_interface.h -o tracklist_interface.moc + moc tracklist_interface.h -o tracklist_interface.moc diff --git a/plugins/context/amarok/Makefile.in b/plugins/context/amarok/Makefile.in index b2f1c58..a72f144 100644 --- a/plugins/context/amarok/Makefile.in +++ b/plugins/context/amarok/Makefile.in @@ -1051,11 +1051,11 @@ uninstall-am: uninstall-pluginLTLIBRARIES @FERRIS_HAVE_AMAROK_TRUE@player_interface.cpp player_interface.h: player_interface.xml @FERRIS_HAVE_AMAROK_TRUE@ qdbusxml2cpp -N -m -i dbus-extra-types.hh -c player -p player_interface $(srcdir)/player_interface.xml -@FERRIS_HAVE_AMAROK_TRUE@ moc-qt4 player_interface.h -o player_interface.moc +@FERRIS_HAVE_AMAROK_TRUE@ moc player_interface.h -o player_interface.moc @FERRIS_HAVE_AMAROK_TRUE@tracklist_interface.cpp tracklist_interface.h: tracklist_interface.xml @FERRIS_HAVE_AMAROK_TRUE@ qdbusxml2cpp -N -m -c tracklist -p tracklist_interface $(srcdir)/tracklist_interface.xml -@FERRIS_HAVE_AMAROK_TRUE@ moc-qt4 tracklist_interface.h -o tracklist_interface.moc +@FERRIS_HAVE_AMAROK_TRUE@ moc tracklist_interface.h -o tracklist_interface.moc # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/facebook/Makefile.am b/plugins/context/facebook/Makefile.am index 7420fa0..dec54cb 100644 --- a/plugins/context/facebook/Makefile.am +++ b/plugins/context/facebook/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisfacebook_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/facebook/Makefile.in b/plugins/context/facebook/Makefile.in index b8d5c44..83d46c5 100644 --- a/plugins/context/facebook/Makefile.in +++ b/plugins/context/facebook/Makefile.in @@ -1083,7 +1083,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/google/Makefile.am b/plugins/context/google/Makefile.am index b17c06e..e8ca209 100644 --- a/plugins/context/google/Makefile.am +++ b/plugins/context/google/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisgoogle_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/google/Makefile.in b/plugins/context/google/Makefile.in index 8aab16a..2f3b6b0 100644 --- a/plugins/context/google/Makefile.in +++ b/plugins/context/google/Makefile.in @@ -1086,7 +1086,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/identica/Makefile.am b/plugins/context/identica/Makefile.am index 430a8af..5a2a1af 100644 --- a/plugins/context/identica/Makefile.am +++ b/plugins/context/identica/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisidentica_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/identica/Makefile.in b/plugins/context/identica/Makefile.in index a1552c3..03d1372 100644 --- a/plugins/context/identica/Makefile.in +++ b/plugins/context/identica/Makefile.in @@ -1058,7 +1058,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # noinst_PROGRAMS = identicatest # identicatest_SOURCES = identicatest.cpp libferrisidentica_shared.hh diff --git a/plugins/context/pastebin/Makefile.am b/plugins/context/pastebin/Makefile.am index 4c48044..624e296 100644 --- a/plugins/context/pastebin/Makefile.am +++ b/plugins/context/pastebin/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrispastebinshared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/pastebin/Makefile.in b/plugins/context/pastebin/Makefile.in index 39b169c..f8a1013 100644 --- a/plugins/context/pastebin/Makefile.in +++ b/plugins/context/pastebin/Makefile.in @@ -1055,7 +1055,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/plasma/Makefile.am b/plugins/context/plasma/Makefile.am index 9bd6dae..aa00113 100644 --- a/plugins/context/plasma/Makefile.am +++ b/plugins/context/plasma/Makefile.am @@ -4,7 +4,7 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ plugindir = $(libdir)/ferris/plugins/context diff --git a/plugins/context/plasma/Makefile.in b/plugins/context/plasma/Makefile.in index f911515..02434a8 100644 --- a/plugins/context/plasma/Makefile.in +++ b/plugins/context/plasma/Makefile.in @@ -1013,7 +1013,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/printer/Makefile.am b/plugins/context/printer/Makefile.am index 28abce6..bb29bde 100644 --- a/plugins/context/printer/Makefile.am +++ b/plugins/context/printer/Makefile.am @@ -4,7 +4,7 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ plugindir = $(libdir)/ferris/plugins/context diff --git a/plugins/context/printer/Makefile.in b/plugins/context/printer/Makefile.in index abce4a9..f6616b3 100644 --- a/plugins/context/printer/Makefile.in +++ b/plugins/context/printer/Makefile.in @@ -1013,7 +1013,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/qtftp/Makefile.am b/plugins/context/qtftp/Makefile.am index 5238861..15906c8 100644 --- a/plugins/context/qtftp/Makefile.am +++ b/plugins/context/qtftp/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisqtftp_moc_impl.cpp %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp BUILT_SOURCES = $(MOC_DEP_SRCS) diff --git a/plugins/context/qtftp/Makefile.in b/plugins/context/qtftp/Makefile.in index 67755c1..9a8e14b 100644 --- a/plugins/context/qtftp/Makefile.in +++ b/plugins/context/qtftp/Makefile.in @@ -1018,7 +1018,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp diff --git a/plugins/context/qthttp/Makefile.am b/plugins/context/qthttp/Makefile.am index bfcd872..f64d071 100644 --- a/plugins/context/qthttp/Makefile.am +++ b/plugins/context/qthttp/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisqthttp_moc_impl.cpp %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp BUILT_SOURCES = $(MOC_DEP_SRCS) diff --git a/plugins/context/qthttp/Makefile.in b/plugins/context/qthttp/Makefile.in index 75cc169..7340b8d 100644 --- a/plugins/context/qthttp/Makefile.in +++ b/plugins/context/qthttp/Makefile.in @@ -1018,7 +1018,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc_impl.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp diff --git a/plugins/context/sane/Makefile.am b/plugins/context/sane/Makefile.am index 1550764..235f99b 100644 --- a/plugins/context/sane/Makefile.am +++ b/plugins/context/sane/Makefile.am @@ -4,7 +4,7 @@ CLEANFILES = $(MOC_DEP_SRCS) mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ plugindir = $(libdir)/ferris/plugins/context diff --git a/plugins/context/sane/Makefile.in b/plugins/context/sane/Makefile.in index 29d5ba6..380f6b5 100644 --- a/plugins/context/sane/Makefile.in +++ b/plugins/context/sane/Makefile.in @@ -1013,7 +1013,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES mocimpls.cpp: $(MOC_DEP_SRCS) touch mocimpls.cpp %_moc.cpp: %.cpp - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/vimeo/Makefile.am b/plugins/context/vimeo/Makefile.am index 41a438b..11b4f92 100644 --- a/plugins/context/vimeo/Makefile.am +++ b/plugins/context/vimeo/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferrisvimeo_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/vimeo/Makefile.in b/plugins/context/vimeo/Makefile.in index bbfc3f1..7f1928b 100644 --- a/plugins/context/vimeo/Makefile.in +++ b/plugins/context/vimeo/Makefile.in @@ -1082,7 +1082,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/webphotos/Makefile.am b/plugins/context/webphotos/Makefile.am index d180458..90eb51e 100644 --- a/plugins/context/webphotos/Makefile.am +++ b/plugins/context/webphotos/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferriswebphotos_shared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/webphotos/Makefile.in b/plugins/context/webphotos/Makefile.in index 98a8c00..ef8be67 100644 --- a/plugins/context/webphotos/Makefile.in +++ b/plugins/context/webphotos/Makefile.in @@ -1174,7 +1174,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/wiki/Makefile.am b/plugins/context/wiki/Makefile.am index 6375a20..8b1f709 100644 --- a/plugins/context/wiki/Makefile.am +++ b/plugins/context/wiki/Makefile.am @@ -1,7 +1,7 @@ MOC_DEP_SRCS=libferriswikishared_moc.cpp %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ BUILT_SOURCES = $(MOC_DEP_SRCS) CLEANFILES = $(MOC_DEP_SRCS) diff --git a/plugins/context/wiki/Makefile.in b/plugins/context/wiki/Makefile.in index 377206c..45c1012 100644 --- a/plugins/context/wiki/Makefile.in +++ b/plugins/context/wiki/Makefile.in @@ -1053,7 +1053,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES %_moc.cpp: %.hh - moc-qt4 $(DEFINES) $(INCPATH) $< -o $@ + moc $(DEFINES) $(INCPATH) $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/plugins/context/xwin/Makefile.am b/plugins/context/xwin/Makefile.am index 157d00e..aafaa45 100644 --- a/plugins/context/xwin/Makefile.am +++ b/plugins/context/xwin/Makefile.am @@ -11,7 +11,7 @@ klipper_interface.cpp klipper_interface.h: klipper_interface.xml qdbusxml2cpp -c klipper -p klipper_interface $(srcdir)/klipper_interface.xml klipper_interface_public.hh: klipper_interface.h - moc-qt4 klipper_interface.h -o klipper_interface_public.hh + moc klipper_interface.h -o klipper_interface_public.hh KLIPPER_SOURCES=libferrisxwin_klipper.cpp libferrisxwin_klipper.hh \ klipper_interface.cpp klipper_interface_public.hh diff --git a/plugins/context/xwin/Makefile.in b/plugins/context/xwin/Makefile.in index 89e3655..ad736df 100644 --- a/plugins/context/xwin/Makefile.in +++ b/plugins/context/xwin/Makefile.in @@ -1053,7 +1053,7 @@ uninstall-am: uninstall-pluginLTLIBRARIES @FERRIS_HAVE_KDE_TRUE@ qdbusxml2cpp -c klipper -p klipper_interface $(srcdir)/klipper_interface.xml @FERRIS_HAVE_KDE_TRUE@klipper_interface_public.hh: klipper_interface.h -@FERRIS_HAVE_KDE_TRUE@ moc-qt4 klipper_interface.h -o klipper_interface_public.hh +@FERRIS_HAVE_KDE_TRUE@ moc klipper_interface.h -o klipper_interface_public.hh # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.