mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
allow vpath search only for source files
Originally committed as revision 12343 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e3773a55be
commit
de2f77d865
4
Makefile
4
Makefile
@ -4,7 +4,9 @@
|
||||
#
|
||||
include config.mak
|
||||
|
||||
VPATH=$(SRC_PATH_BARE)
|
||||
vpath %.c $(SRC_PATH_BARE)
|
||||
vpath %.h $(SRC_PATH_BARE)
|
||||
vpath %.texi $(SRC_PATH_BARE)
|
||||
|
||||
CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
|
||||
-I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
|
||||
|
11
common.mak
11
common.mak
@ -2,8 +2,13 @@
|
||||
# common bits used by all libraries
|
||||
#
|
||||
|
||||
VPATH = $(SRC_PATH_BARE)/lib$(NAME)
|
||||
SRC_DIR = "$(VPATH)"
|
||||
LIBSRC = $(SRC_PATH_BARE)/lib$(NAME)
|
||||
|
||||
vpath %.c $(LIBSRC)
|
||||
vpath %.h $(LIBSRC)
|
||||
vpath %.S $(LIBSRC)
|
||||
|
||||
SRC_DIR = "$(LIBSRC)"
|
||||
|
||||
CFLAGS += $(CFLAGS-yes)
|
||||
OBJS += $(OBJS-yes)
|
||||
@ -44,7 +49,7 @@ $(SLIBNAME_WITH_MAJOR): $(OBJS)
|
||||
%.ho: %.h
|
||||
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
|
||||
|
||||
ALLHEADERS = $(subst $(VPATH)/,,$(wildcard $(VPATH)/*.h))
|
||||
ALLHEADERS = $(subst $(LIBSRC)/,,$(wildcard $(LIBSRC)/*.h))
|
||||
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
|
||||
|
||||
depend dep: $(SRCS)
|
||||
|
Loading…
Reference in New Issue
Block a user