From de2f77d865e7400c9bf5839ca0952f2aa532677c Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Wed, 5 Mar 2008 21:27:58 +0000 Subject: allow vpath search only for source files Originally committed as revision 12343 to svn://svn.ffmpeg.org/ffmpeg/trunk --- common.mak | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'common.mak') diff --git a/common.mak b/common.mak index 2ba85157be..ac317d99d9 100644 --- a/common.mak +++ b/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) -- cgit v1.2.3