comparison Makefile @ 32236:4f4a43ed8922

cosmetics: Rename DEPS variable to DEP_FILES.
author diego
date Mon, 20 Sep 2010 12:07:56 +0000
parents ba225e81c184
children b54535b624d6
comparison
equal deleted inserted replaced
32235:ba225e81c184 32236:4f4a43ed8922
731 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o 731 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
732 OBJS_MPLAYER += $(OBJS_MPLAYER-yes) 732 OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
733 733
734 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) 734 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
735 MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) 735 MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
736 DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) 736 DEP_FILES = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
737 737
738 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) 738 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
739 ALL_PRG-$(MENCODER) += mencoder$(EXESUF) 739 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
740 740
741 INSTALL_TARGETS-$(GUI) += install-gui 741 INSTALL_TARGETS-$(GUI) += install-gui
885 885
886 ###### dependency declarations / specific CFLAGS ###### 886 ###### dependency declarations / specific CFLAGS ######
887 887
888 # Make sure all generated header files are created. 888 # Make sure all generated header files are created.
889 codec-cfg.d codec-cfg.o: codecs.conf.h 889 codec-cfg.d codec-cfg.o: codecs.conf.h
890 $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h 890 $(DEP_FILES) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
891 $(call ADDSUFFIXES,.d .o,mpcommon osdep/mplayer.rc): version.h 891 $(call ADDSUFFIXES,.d .o,mpcommon osdep/mplayer.rc): version.h
892 892
893 osdep/mplayer-rc.o: osdep/mplayer.exe.manifest 893 osdep/mplayer-rc.o: osdep/mplayer.exe.manifest
894 894
895 gui/%: CFLAGS += -Wno-strict-prototypes 895 gui/%: CFLAGS += -Wno-strict-prototypes
1153 dhahelperwinclean: 1153 dhahelperwinclean:
1154 -rm -f $(addprefix vidix/dhahelperwin/,*.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp) 1154 -rm -f $(addprefix vidix/dhahelperwin/,*.o *~ dhahelper.sys dhasetup.exe base.tmp temp.exp)
1155 1155
1156 1156
1157 1157
1158 -include $(DEPS) 1158 -include $(DEP_FILES)
1159 1159
1160 .PHONY: all doxygen *install* *tools drivers dhahelper* 1160 .PHONY: all doxygen *install* *tools drivers dhahelper*
1161 .PHONY: checkheaders *clean tests 1161 .PHONY: checkheaders *clean tests
1162 1162
1163 # Disable suffix rules. Most of the builtin rules are suffix rules, 1163 # Disable suffix rules. Most of the builtin rules are suffix rules,