summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-05-01 19:16:35 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-05-01 19:16:35 +0000
commit1e7e1801068e0e44c367396c73d6f53b62775891 (patch)
tree0eeb0181ddb58f751cf4e3dc5c7afc254c4d6061 /Makefile
parent81a86e4f1e4764ba0bfb3af509ffdf3d8dc80baf (diff)
downloadmpv-1e7e1801068e0e44c367396c73d6f53b62775891.tar.bz2
mpv-1e7e1801068e0e44c367396c73d6f53b62775891.tar.xz
Reuse common Makefile infrastructure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23200 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile29
1 files changed, 9 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index 34bbfa255b..6409e9c9df 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,6 @@
include config.mak
-CFLAGS = -I. -I./libavutil $(OPTFLAGS)
-
-CFLAGS-$(LIBAVCODEC) += -I./libavcodec
-CFLAGS += $(CFLAGS-yes)
-
COMMON_LDFLAGS += $(EXTRA_LIB)\
$(EXTRALIBS) \
@@ -91,11 +86,6 @@ OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
-OBJS_COMMON = $(SRCS_COMMON:.c=.o)
-OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
-OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
-
-SRCS_COMMON += $(SRCS_COMMON-yes)
COMMON_LIBS += $(COMMON_LIBS-yes)
LIBS_MPLAYER += $(LIBS_MPLAYER-yes)
OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
@@ -141,10 +131,13 @@ PARTS = dvdread \
all: $(ALL_PRG)
-dep depend: help_mp.h version.h codecs.conf.h
- $(CC) -MM $(CFLAGS) $(SRCS_MPLAYER) $(SRCS_MENCODER) $(SRCS_COMMON) 1>.depend
+dep depend:: help_mp.h version.h codecs.conf.h
@for a in $(PARTS); do $(MAKE) -C $$a dep; done
+include mpcommon.mak
+
+CFLAGS := $(subst -I..,-I.,$(CFLAGS))
+
libaf/libaf.a:
$(MAKE) -C libaf
@@ -305,16 +298,15 @@ uninstall:
fi ; \
done
-clean:
- -rm -f *.o *.a *~
+clean::
-rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \
codecs.conf.h help_mp.h version.h
@for a in $(PARTS); do $(MAKE) -C $$a clean; done
-distclean: clean doxygen_clean
+distclean:: doxygen_clean
@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
- -rm -f .depend configure.log config.mak config.h
+ -rm -f configure.log config.mak config.h
strip:
strip -s $(ALL_PRG)
@@ -405,7 +397,4 @@ gui/libgui.a: .norecurse $(wildcard gui/*.[ch] gui/*/*.[ch] gui/*/*/*.[ch])
libass/libass.a: .norecurse $(wildcard libass/*.[ch])
--include .depend
-
-.PHONY: all install* uninstall clean distclean strip dep depend
-.PHONY: doxygen doxygen_clean
+.PHONY: all install* uninstall strip doxygen doxygen_clean