* Fixed the BeOS compile typo.

[vlc] / plugins / qt / Makefile

diff --git a/plugins/qt/Makefile b/plugins/qt/Makefile
index 1676ed3937acb882e3eee64da988a37a5b1eb666..0dd8aef356025fd1d7acede8931c7e53651caf64 100644 (file)
--- a/plugins/qt/Makefile
+++ b/plugins/qt/Makefile
@@ -3,56 +3,41 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
-include ../../Makefile.modules
+#
+# Objects
+#
 
-###############################################################################
-# Objects and files
-###############################################################################
 PLUGIN_QT = qt.o intf_qt.o
-BUILTIN_QT = $(PLUGIN_QT:%.o=%-BUILTIN.o)
+BUILTIN_QT = $(PLUGIN_QT:%.o=BUILTIN_%.o)
 
 ALL_OBJ = $(PLUGIN_QT) $(BUILTIN_QT)
 
-cppobjects := $(ALL_OBJ)
-cppdependancies := $(cppobjects:%.o=.dep/%.dpp)
-
-export
-
 #
 # Virtual targets
 #
-all:
-
-clean:
-       rm -f $(ALL_OBJ)
-       rm -f *.o *.moc *.bak *.builtin
-       rm -rf .dep
-
-FORCE:
 
-$(cppdependancies): %.dpp: FORCE
-       @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
-
-$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
+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): %.o: .dep/%.dpp
+$(BUILTIN_QT): BUILTIN_%.o: .dep/%.dpp
 $(BUILTIN_QT): %.o: %.moc
-       $(CC) $(CFLAGS) -DBUILTIN -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%.moc=%.cpp)
-$(BUILTIN_QT:%.o=%.moc): %.moc: %.cpp
-       moc -i $< -o $@
+       $(CC) $(CFLAGS) -DBUILTIN -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:BUILTIN_%.moc=%.cpp)
+$(BUILTIN_QT:%.o=%.moc): BUILTIN_%.moc: %.cpp
+       grep -q Q_OBJECT $< && $(MOC) -i $< -o $@ || true
 
 #
 # Real targets
 #
+
 ../../lib/qt.so: $(PLUGIN_QT)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lqt -L${QTDIR}/lib
+       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QT)
 
 ../../lib/qt.a: $(BUILTIN_QT)
        ar r $@ $^
+       $(RANLIB) $@