Commit de2f77d8 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

allow vpath search only for source files

Originally committed as revision 12343 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e3773a55
......@@ -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 \
......
......@@ -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)
......
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