* Fixed the BeOS compile typo.

[vlc] / plugins / qt / Makefile

diff --git a/plugins/qt/Makefile b/plugins/qt/Makefile
index 2b51fa6bed9eb9d71d53c26725c31ca6bfc54ae3..0dd8aef356025fd1d7acede8931c7e53651caf64 100644 (file)
--- a/plugins/qt/Makefile
+++ b/plugins/qt/Makefile
@@ -20,15 +20,15 @@ include ../../Makefile.modules
 
 $(PLUGIN_QT): %.o: .dep/%.dpp
 $(PLUGIN_QT): %.o: %.moc
-       $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%.moc=%.cpp)
+       $(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%.moc=%.cpp)
 $(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp
-       moc -i $< -o $@
+       grep -q Q_OBJECT $< && $(MOC) -i $< -o $@ || true
 
 $(BUILTIN_QT): BUILTIN_%.o: .dep/%.dpp
 $(BUILTIN_QT): %.o: %.moc
        $(CC) $(CFLAGS) -DBUILTIN -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:BUILTIN_%.moc=%.cpp)
 $(BUILTIN_QT:%.o=%.moc): BUILTIN_%.moc: %.cpp
-       moc -i $< -o $@
+       grep -q Q_OBJECT $< && $(MOC) -i $< -o $@ || true
 
 #
 # Real targets
@@ -39,4 +39,5 @@ $(BUILTIN_QT:%.o=%.moc): BUILTIN_%.moc: %.cpp
 
 ../../lib/qt.a: $(BUILTIN_QT)
        ar r $@ $^
+       $(RANLIB) $@