# HG changeset patch
# User diego
# Date 1209459188 0
# Node ID 098e4774b95172fde23e4cb138257628aee384ed
# Parent  36a4064bba4fc1ce98b1316e178dd28eff9881a0
Merge mpcommon.mak into Makefile.

diff -r 36a4064bba4f -r 098e4774b951 Makefile
--- a/Makefile	Tue Apr 29 08:35:58 2008 +0000
+++ b/Makefile	Tue Apr 29 08:53:08 2008 +0000
@@ -628,6 +628,16 @@
 MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(OBJS_COMMON) $(COMMON_LIBS)
 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
 
+SRCS_COMMON    += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes)
+SRCS_MENCODER  += $(SRCS_MENCODER-yes)
+SRCS_MPLAYER   += $(SRCS_MPLAYER-yes)
+
+OBJS_COMMON    += $(addsuffix .o, $(basename $(SRCS_COMMON)) )
+OBJS_MENCODER  += $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
+OBJS_MPLAYER   += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
+
+CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
+
 INSTALL_TARGETS-$(MPLAYER)  += install-mplayer  install-mplayer-man
 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
 INSTALL_TARGETS-$(GUI)      += install-gui
@@ -691,7 +701,20 @@
 recurse:
 	for part in $(PARTS); do $(MAKE) -C $$part; done
 
-include mpcommon.mak
+%.d: %.c
+	$(MPDEPEND_CMD) > $@
+
+%.d: %.cpp
+	$(MPDEPEND_CMD_CXX) > $@
+
+%.d: %.m
+	$(MPDEPEND_CMD) > $@
+
+%.ho: %.h
+	$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
+
+%.o: %.m
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
 $(DEPS) recurse: help_mp.h version.h codecs.conf.h
@@ -863,6 +886,9 @@
 tags:
 	rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a
 
+ALLHEADERS = $(wildcard *.h)
+checkheaders: $(ALLHEADERS:.h=.ho)
+
 # ./configure must be rerun if it changed
 config.mak: configure
 	@echo "############################################################"
@@ -947,3 +973,4 @@
 -include $(DEPS)
 
 .PHONY: all doxygen *install* recurse strip *tools
+.PHONY: checkheaders *clean dep depend
diff -r 36a4064bba4f -r 098e4774b951 mpcommon.mak
--- a/mpcommon.mak	Tue Apr 29 08:35:58 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-SRCS_COMMON          += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes)
-SRCS_MPLAYER         += $(SRCS_MPLAYER-yes)
-SRCS_MENCODER        += $(SRCS_MENCODER-yes)
-
-OBJS_COMMON    += $(addsuffix .o, $(basename $(SRCS_COMMON)) )
-OBJS_MPLAYER   += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
-OBJS_MENCODER  += $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
-
-CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
-
-%.d: %.c
-	$(MPDEPEND_CMD) > $@
-
-%.d: %.cpp
-	$(MPDEPEND_CMD_CXX) > $@
-
-%.d: %.m
-	$(MPDEPEND_CMD) > $@
-
-%.ho: %.h
-	$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
-
-%.o: %.m
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-ALLHEADERS = $(wildcard *.h)
-checkheaders: $(ALLHEADERS:.h=.ho)
-
-.PHONY: checkheaders *clean dep depend