diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:07:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:15:37 +0300 |
| commit | 267a3f4c9c00848f32c341595d2d831157a79bee (patch) | |
| tree | cdef15bb746e3a41b1813076f24035fcc8385c30 /Makefile | |
| parent | 5484215d044522bcd30516e458e421f403ca8e35 (diff) | |
| parent | 96fa9c4e249e9467f21e32191882e511e762fb1f (diff) | |
| download | mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.bz2 mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.xz | |
Merge svn changes up to r26680
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -378,6 +378,7 @@ SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ stream/tcp.c \ stream/stream_rtp.c \ stream/stream_udp.c \ + stream/librtsp/rtsp.c \ stream/realrtsp/asmrp.c \ stream/realrtsp/real.c \ stream/realrtsp/rmff.c \ @@ -693,10 +694,7 @@ DIRS = . \ TOOLS \ vidix \ -all: recurse $(ALL_PRG) - -recurse: - for part in $(PARTS); do $(MAKE) -C $$part; done +all: $(ALL_PRG) %.d: %.c $(MPDEPEND_CMD) > $@ @@ -747,7 +745,7 @@ ifneq ($(HELP_FILE),help/help_mp-en.h) endif define RECURSIVE_RULE -$(part)/$(notdir $(part)).a: +$(part)/$(notdir $(part)).a: recurse $(MAKE) -C $(part) endef @@ -897,7 +895,7 @@ TAGS: tags: rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a -ALLHEADERS = $(wildcard *.h) +ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) checkheaders: $(ALLHEADERS:.h=.ho) # ./configure must be rerun if it changed |