moc-qt4 -> moc

diff --git a/DBusGlue/Makefile.am b/DBusGlue/Makefile.am
index dfa36c4d7c4ed556ee1a9829bd74f3a474a13e58..a69d3a99b861af91e1937e63006f4f90dbdcf4f9 100644 (file)
--- 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 f8f01d7e72a2a39341c6e1b41ad0d57c3a94c99e..500a1f6b55835c4e5a661d1964f93210e06d7251 100644 (file)
--- 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 e0aa38eab89f1e5027867f595472995a40b12465..cca57420d0ee492568914de3e3906415ce46e94a 100644 (file)
--- 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 1b6c83a60dd4e6933e22863bb4924545814ba05e..40fefc8d4efbb69837aa70b82939e4ebb45faf26 100644 (file)
--- 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 fa84f384982d0a6f2b47b13731951805482b0718..46c94cca9957c16aebe5d74b495347695dba6c2d 100644 (file)
--- 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 e89a9696dda90ef75d734a65feaa73fbba19ccd8..f5da6ef5c7c984da183ffc7d363a7398de280f48 100644 (file)
--- 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 23280fd9fcf61d984b8f48d565e7c39d959ff2c8..ffab881eca6d106feaf40f2f491719584dde425e 100644 (file)
--- 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 e55f0d48d464312b606665bf81c9829a79c62254..e2ec06eb5055b9a7055efa46829deb530acf520d 100644 (file)
--- 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 922bfb5e1651cd25becdb39044c7bb8f939ca6b6..dda3f69f531a3d991190d72e20d6afc4a2596ab6 100644 (file)
--- 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 0db8b287d72a2d18e8f0d23441d51d255924a52b..64de13f6a9bf9f87490c522444322fd0906edc95 100644 (file)
--- 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 a44eb718500b43c5b2d1bd0ec5ea8ad205692205..98186f260d50de153c757e74c49dc03a91793713 100644 (file)
--- 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 b2f1c586f37e29cec936a47b1e0ac5a787fe8468..a72f1445eeeffb6ab903d3ffb0497d7bf5a8df9e 100644 (file)
--- 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 7420fa05b4c348edc53071c23a91fc6c0ea0bd32..dec54cbfb1fb8c0b5e1333409f6ff09d808bccb7 100644 (file)
--- 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 b8d5c444836c9a10c581b091545c43b8dab50f18..83d46c57136ba12d3e4a428ca67d0cee64bec22c 100644 (file)
--- 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 b17c06e173095eec7c83c9c29d4f295490c93c80..e8ca209cb7b7f758885acfc2c8dee17d215b64b5 100644 (file)
--- 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 8aab16aa50fa2422100183fb413c7403fc2a8332..2f3b6b05ee33afb62d9f4ffa0eeda64cb6ef23c5 100644 (file)
--- 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 430a8af3ed568f91319cf4944255f0eafd4713cd..5a2a1af55dfeca127131d1c7c06089343c1ca24d 100644 (file)
--- 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 a1552c37905d6305079c9447f419f468f4adca3a..03d13723742d5005d46daf4a6c36b2e6672cee1b 100644 (file)
--- 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 4c48044649a2bfe3d223e5c409d623596d086661..624e296d36e1fc93a8b9bb0034ac7e726646b865 100644 (file)
--- 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 39b169ceec8ead27ee28b45d4e38c77e19a76ac4..f8a101326e85380389bad0e19ed318e1058d0194 100644 (file)
--- 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 9bd6daee65502e977ca3627c76f08fd651eaa269..aa0011393e314ada2ff57897804b278b164e244a 100644 (file)
--- 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 f9115154928fe83ac96c54dfb64b10e352373086..02434a8efd8f47d02ee791b093c1cf25890d0bc7 100644 (file)
--- 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 28abce660fdc1297537fe10e8e47fa720fe71941..bb29bde25f89bed6ddd4545cf4586239120d6529 100644 (file)
--- 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 abce4a9596ffbbe38b2e601a203ca1e645392892..f6616b38b21019e77aa28899e848f7c6e1328c5e 100644 (file)
--- 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 52388614959f89766d906bd63e76ee277af80441..15906c8a5b9a3eb4435de6e419519859abb8ac04 100644 (file)
--- 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 67755c16b78654dab7720b0bc68350f1b3cba5f4..9a8e14baacacc0c78bc6eb9d26f13e0d35e962b6 100644 (file)
--- 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 bfcd872a6c709dd6fa90156568dfdcfca9b2e28b..f64d0715a9eaf74824e5c881e8b79344da4db19b 100644 (file)
--- 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 75cc1699fdd87bc3bf9fbb804f16de70dd92c86e..7340b8debc7f5dc5dff4d19b0cf9a8fb67750d11 100644 (file)
--- 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 155076401615d5a9f68adbd410f1978231bcf2c2..235f99b6fb9fcd4e4d320a68009e48d4d970fefb 100644 (file)
--- 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 29d5ba670965e6baeea5aab9e99bf01cc92dcb41..380f6b5cb54041f96058e0e2108b175a13966226 100644 (file)
--- 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 41a438b7a55fb2a763cabb3501b97f1263a71311..11b4f920c8fea1cae2667511694ceef44945036e 100644 (file)
--- 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 bbfc3f1f968f5c8bd1c9dff837edf484ad186419..7f1928bf4d8ab46aff38a989cb010d52d42ab304 100644 (file)
--- 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 d1804589190c34901888277da4e60a4edacbbd6c..90eb51ea11075fdbd17450390d1cbdfb73e4dd0b 100644 (file)
--- 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 98a8c0023c777efc760a095145b456b77a13bffe..ef8be67dac3a888f8cf6fd3d952eb86282602138 100644 (file)
--- 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 6375a207df17cc304f498ff6cd7460c27fd682f6..8b1f709979a81544559bab5bba6f1707182a9faf 100644 (file)
--- 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 377206c8114b8c91414e512a3c7ee5abf66b95fd..45c10127133617a970058932b6416eeca6e8f9b6 100644 (file)
--- 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 157d00efce195058cfdde9012932c2026d32eaee..aafaa45be659bf1a765c737047a2173fbe8af340 100644 (file)
--- 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 89e365511131e67929c8a50a6369623a6b3bd2de..ad736df5742e7f6a5be75ae35f7dfd6218955b6b 100644 (file)
--- 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.