highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow vpath search only for source files

Browse Source 
Originally committed as revision 12343 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2008-03-05 21:27:58 +00:00
parent e3773a55be
commit de2f77d865
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -4,7 +4,9 @@
# #
include config.mak 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 \ CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
-I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \

11
common.mak
View File

@ -2,8 +2,13 @@
# common bits used by all libraries # common bits used by all libraries
# #
VPATH = $(SRC_PATH_BARE)/lib$(NAME) LIBSRC = $(SRC_PATH_BARE)/lib$(NAME)
SRC_DIR = "$(VPATH)"
vpath %.c $(LIBSRC)
vpath %.h $(LIBSRC)
vpath %.S $(LIBSRC)
SRC_DIR = "$(LIBSRC)"
CFLAGS += $(CFLAGS-yes) CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes) OBJS += $(OBJS-yes)
@ -44,7 +49,7 @@ $(SLIBNAME_WITH_MAJOR): $(OBJS)
%.ho: %.h %.ho: %.h
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $< $(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)) checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
depend dep: $(SRCS) depend dep: $(SRCS)