Commit 57b4a3dd authored by Mans Rullgard's avatar Mans Rullgard

build: include sub-makefiles using full path instead of symlinks

Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 618230c7
...@@ -79,7 +79,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset) ...@@ -79,7 +79,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset)
SKIPHEADERS = cmdutils_common_opts.h SKIPHEADERS = cmdutils_common_opts.h
include common.mak include $(SRC_PATH)/common.mak
FF_LDFLAGS := $(FFLDFLAGS) FF_LDFLAGS := $(FFLDFLAGS)
FF_EXTRALIBS := $(FFEXTRALIBS) FF_EXTRALIBS := $(FFEXTRALIBS)
...@@ -105,7 +105,7 @@ endef ...@@ -105,7 +105,7 @@ endef
define DOSUBDIR define DOSUBDIR
$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
SUBDIR := $(1)/ SUBDIR := $(1)/
include $(1)/Makefile include $(SRC_PATH)/$(1)/Makefile
endef endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
...@@ -182,8 +182,8 @@ config: ...@@ -182,8 +182,8 @@ config:
check: test checkheaders check: test checkheaders
include doc/Makefile include $(SRC_PATH)/doc/Makefile
include tests/Makefile include $(SRC_PATH)/tests/Makefile
# Dummy rule to stop make trying to rebuild removed or renamed headers # Dummy rule to stop make trying to rebuild removed or renamed headers
%.h: %.h:
......
...@@ -3214,23 +3214,10 @@ if enabled source_path_used; then ...@@ -3214,23 +3214,10 @@ if enabled source_path_used; then
" "
FILES=" FILES="
Makefile Makefile
common.mak
subdir.mak
doc/Makefile
doc/texi2pod.pl doc/texi2pod.pl
libavcodec/Makefile
libavcodec/${arch}/Makefile
libavdevice/Makefile
libavfilter/Makefile
libavfilter/${arch}/Makefile
libavformat/Makefile
libavutil/Makefile
libpostproc/Makefile
libswscale/Makefile
tests/Makefile
" "
map 'mkdir -p $v' $DIRS; map 'mkdir -p $v' $DIRS;
map 'test -f "$source_path/$v" && $ln_s "$source_path/$v" $v' $FILES map '$ln_s "$source_path/$v" $v' $FILES
fi fi
config_files="$TMPH config.mak" config_files="$TMPH config.mak"
......
...@@ -649,7 +649,7 @@ OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ ...@@ -649,7 +649,7 @@ OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \
# well. # well.
OBJS-$(!CONFIG_SMALL) += inverse.o OBJS-$(!CONFIG_SMALL) += inverse.o
-include $(SUBDIR)$(ARCH)/Makefile -include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile
SKIPHEADERS += %_tablegen.h \ SKIPHEADERS += %_tablegen.h \
%_tables.h \ %_tables.h \
...@@ -678,7 +678,7 @@ DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86 ...@@ -678,7 +678,7 @@ DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF) CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
include $(SUBDIR)../subdir.mak include $(SRC_PATH)/subdir.mak
$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o
......
...@@ -29,4 +29,4 @@ OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o ...@@ -29,4 +29,4 @@ OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h
include $(SUBDIR)../subdir.mak include $(SRC_PATH)/subdir.mak
...@@ -58,8 +58,8 @@ OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o ...@@ -58,8 +58,8 @@ OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
-include $(SUBDIR)$(ARCH)/Makefile -include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile
DIRS = x86 DIRS = x86
include $(SUBDIR)../subdir.mak include $(SRC_PATH)/subdir.mak
...@@ -336,6 +336,6 @@ OBJS-$(CONFIG_JACK_INDEV) += timefilter.o ...@@ -336,6 +336,6 @@ OBJS-$(CONFIG_JACK_INDEV) += timefilter.o
EXAMPLES = output EXAMPLES = output
TESTPROGS = timefilter TESTPROGS = timefilter
include $(SUBDIR)../subdir.mak include $(SRC_PATH)/subdir.mak
$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale $(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
...@@ -82,6 +82,6 @@ DIRS = arm bfin sh4 x86 ...@@ -82,6 +82,6 @@ DIRS = arm bfin sh4 x86
ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
include $(SUBDIR)../subdir.mak include $(SRC_PATH)/subdir.mak
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2 $(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
...@@ -5,4 +5,4 @@ HEADERS = postprocess.h ...@@ -5,4 +5,4 @@ HEADERS = postprocess.h
OBJS = postprocess.o OBJS = postprocess.o
include $(SUBDIR)../subdir.mak include $(SRC_PATH)/subdir.mak
...@@ -22,4 +22,4 @@ TESTPROGS = colorspace swscale ...@@ -22,4 +22,4 @@ TESTPROGS = colorspace swscale
DIRS = bfin mlib ppc sparc x86 DIRS = bfin mlib ppc sparc x86
include $(SUBDIR)../subdir.mak include $(SRC_PATH)/subdir.mak
SRC_DIR := $(SRC_PATH)/lib$(NAME) SRC_DIR := $(SRC_PATH)/lib$(NAME)
include $(SUBDIR)../common.mak include $(SRC_PATH)/common.mak
LIBVERSION := $(lib$(NAME)_VERSION) LIBVERSION := $(lib$(NAME)_VERSION)
LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment