mirror of https://github.com/mpv-player/mpv
Group some variable declarations together in sensible places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27204 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
da6a5a6979
commit
7c9ad57710
10
Makefile
10
Makefile
|
@ -645,6 +645,7 @@ OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
|
||||||
|
|
||||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
|
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
|
||||||
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
|
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
|
||||||
|
DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
|
||||||
|
|
||||||
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
|
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
|
||||||
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
|
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
|
||||||
|
@ -700,12 +701,17 @@ DIRS = . \
|
||||||
TOOLS \
|
TOOLS \
|
||||||
vidix \
|
vidix \
|
||||||
|
|
||||||
|
ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
|
||||||
|
|
||||||
PARTS = libavcodec \
|
PARTS = libavcodec \
|
||||||
libavformat \
|
libavformat \
|
||||||
libavutil \
|
libavutil \
|
||||||
libpostproc \
|
libpostproc \
|
||||||
libswscale \
|
libswscale \
|
||||||
|
|
||||||
|
ALLPARTLIBS = $(foreach part, $(PARTS), $(part)/$(part).a)
|
||||||
|
FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] libavcodec/*/*.[chS])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
###### generic rules #######
|
###### generic rules #######
|
||||||
|
@ -727,14 +733,11 @@ all: $(ALL_PRG-yes)
|
||||||
%.ho: %.h
|
%.ho: %.h
|
||||||
$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
|
$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
|
||||||
|
|
||||||
ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
|
|
||||||
checkheaders: $(ALLHEADERS:.h=.ho)
|
checkheaders: $(ALLHEADERS:.h=.ho)
|
||||||
|
|
||||||
dep depend: $(DEPS)
|
dep depend: $(DEPS)
|
||||||
for part in $(PARTS); do $(MAKE) -C $$part depend; done
|
for part in $(PARTS); do $(MAKE) -C $$part depend; done
|
||||||
|
|
||||||
ALLPARTLIBS = $(foreach part, $(PARTS), $(part)/$(part).a)
|
|
||||||
FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] libavcodec/*/*.[chS])
|
|
||||||
$(ALLPARTLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h
|
$(ALLPARTLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h
|
||||||
$(MAKE) -C $(@D)
|
$(MAKE) -C $(@D)
|
||||||
touch $@
|
touch $@
|
||||||
|
@ -778,7 +781,6 @@ osdep/mplayer-rc.o: osdep/mplayer.rc version.h
|
||||||
|
|
||||||
codec-cfg.d: codecs.conf.h
|
codec-cfg.d: codecs.conf.h
|
||||||
mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h
|
mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h
|
||||||
DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
|
|
||||||
$(DEPS): help_mp.h
|
$(DEPS): help_mp.h
|
||||||
|
|
||||||
dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS)
|
dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS)
|
||||||
|
|
Loading…
Reference in New Issue