diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 18:12:36 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 18:12:36 +0000 |
commit | dc2be42703cd95be495d420aeeaec79448222fa4 (patch) | |
tree | 02aa41ebcac77a378d93898cb064bf1c925545fe /libmpdemux | |
parent | 7ecf9d9e29e9cb857bd7120cd5be3abb11f20151 (diff) | |
download | mpv-dc2be42703cd95be495d420aeeaec79448222fa4.tar.bz2 mpv-dc2be42703cd95be495d420aeeaec79448222fa4.tar.xz |
Merge common parts of all Makefiles into one file included by all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/Makefile | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index c6e0f8955b..5f26be98b9 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -103,36 +103,11 @@ ifeq ($(STREAMING_LIVE555),yes) SRCS += demux_rtp.cpp demux_rtp_codec.cpp endif -OBJS = $(SRCS:.c=.o) -OBJS += $(SRCS:.cpp=.o) -INCLUDE = -I.. -I../stream -I../loader $(LIBAV_INC) -CFLAGS = $(INCLUDE) $(OPTFLAGS) -CPLUSPLUSFLAGS = $(CFLAGS) -D__STDC_LIMIT_MACROS - -.SUFFIXES: .c .cpp .o - -# .PHONY: all clean +CFLAGS = -I../stream -I../loader $(LIBAV_INC) -all: $(LIBNAME) +CPLUSPLUSFLAGS = $(CFLAGS) -D__STDC_LIMIT_MACROS -.c.o: - $(CC) -c $(CFLAGS) -o $@ $< .cpp.o: $(CC) -c $(CPLUSPLUSFLAGS) -o $@ $< -$(LIBNAME): $(OBJS) - $(AR) r $(LIBNAME) $(OBJS) - $(RANLIB) $(LIBNAME) - -clean: - rm -f *.o *.a *~ - -distclean: clean - rm -f .depend - -dep depend: - $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend - -ifneq ($(wildcard .depend),) -include .depend -endif +include ../mpcommon.mak |