@@ -58,10 +58,14 @@
 PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
 PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
 INSTALL_LIB = @INSTALL_LIB@
 UNINSTALL_LIB = @UNINSTALL_LIB@
 CLEAN_LIB = @CLEAN_LIB@
+CC_DEPENDS = @CC_DEPENDS@
+CXX_DEPENDS = @CXX_DEPENDS@
+OBJC_DEPENDS = @OBJC_DEPENDS@
+OBJCXX_DEPENDS = @OBJCXX_DEPENDS@
 LN_S = @LN_S@
 MKDIR_P = mkdir -p
 INSTALL = @INSTALL@
 SHELL = @SHELL@
 MSGFMT = @MSGFMT@
@@ -124,13 +128,39 @@
 	regen=0; \
 	deps=""; \
 	test -f .deps || regen=1; \
 	for i in ${SRCS}; do \
 		case $$i in \
-			*.c | *.cc | *.cxx | *.m | *.mm | *.S) \
-				test $$i -nt .deps && regen=1; \
-				deps="$$deps $$i.dep"; \
+			*.c) \
+				if test x"${CC_DEPENDS}" = x"yes"; then \
+					test $$i -nt .deps && regen=1; \
+					deps="$$deps $$i.dep"; \
+				fi; \
+				;; \
+			*.cc | *.cxx) \
+				if test x"${CXX_DEPENDS}" = x"yes"; then \
+					test $$i -nt .deps && regen=1; \
+					deps="$$deps $$i.dep"; \
+				fi; \
+				;; \
+			*.m) \
+				if test x"${OBJC_DEPENDS}" = x"yes"; then \
+					test $$i -nt .deps && regen=1; \
+					deps="$$deps $$i.dep"; \
+				fi; \
+				;; \
+			*.mm) \
+				if test x"${OBJCXX_DEPENDS}" = x"yes"; then \
+					test $$i -nt .deps && regen=1; \
+					deps="$$deps $$i.dep"; \
+				fi; \
+				;; \
+			*.S) \
+				if test x"${AS_DEPENDS}" = x"yes"; then \
+					test $$i -nt .deps && regen=1; \
+					deps="$$deps $$i.dep"; \
+				fi; \
 				;; \
 		esac; \
 	done; \
 	if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
 		${DEPEND_STATUS}; \
@@ -142,12 +172,32 @@
 			touch -t 0001010000 .deps; \
 			${DEPEND_FAILED}; \
 		fi; \
 	fi
 
-.c.c.dep .cc.cc.dep .cxx.cxx.dep .m.m.dep .mm.mm.dep .S.S.dep:
-	${CPP} ${CPPFLAGS} -M $< | \
+.c.c.dep:
+	${CPP} ${CPPFLAGS} ${CFLAGS} -M $< | \
+	sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
+	{ rm -f $@; false; }
+
+.cc.cc.dep .cxx.cxx.dep:
+	${CPP} ${CPPFLAGS} ${CXXFLAGS} -M $< | \
+	sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
+	{ rm -f $@; false; }
+
+.m.m.dep:
+	${CPP} ${CPPFLAGS} ${OBJCFLAGS} -M $< | \
+	sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
+	{ rm -f $@; false; }
+
+.mm.mm.dep:
+	${CPP} ${CPPFLAGS} ${OBJCPPFLAGS} -M $< | \
+	sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
+	{ rm -f $@; false; }
+
+.S.S.dep:
+	${CPP} ${CPPFLAGS} ${ASFLAGS} -M $< | \
 	sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
 	{ rm -f $@; false; }
 
 pre-depend: