Mercurial > mplayer.hg
comparison libmpdemux/Makefile @ 11836:33351e4ce3de
mkv.cpp -> mkv_old.cpp, to avoid dependency name collision with mkv.c
| author | arpi |
|---|---|
| date | Fri, 23 Jan 2004 21:34:28 +0000 |
| parents | 9a81d7b4c0b6 |
| children | b962aaad2940 |
comparison
equal
deleted
inserted
replaced
| 11835:7d5b1df3b952 | 11836:33351e4ce3de |
|---|---|
| 28 | 28 |
| 29 ifeq ($(MATROSKA_INTERNAL),yes) | 29 ifeq ($(MATROSKA_INTERNAL),yes) |
| 30 SRCS += demux_mkv.c ebml.c | 30 SRCS += demux_mkv.c ebml.c |
| 31 endif | 31 endif |
| 32 ifeq ($(MATROSKA_EXTERNAL),yes) | 32 ifeq ($(MATROSKA_EXTERNAL),yes) |
| 33 CPLUSPLUSSRCS += demux_mkv.cpp | 33 CPLUSPLUSSRCS += demux_mkv_old.cpp |
| 34 endif | 34 endif |
| 35 | 35 |
| 36 | 36 |
| 37 OBJS = $(SRCS:.c=.o) | 37 OBJS = $(SRCS:.c=.o) |
| 38 OBJS += $(CPLUSPLUSSRCS:.cpp=.o) | 38 OBJS += $(CPLUSPLUSSRCS:.cpp=.o) |