summaryrefslogtreecommitdiff
path: root/common.mak
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2008-03-05 21:27:58 +0000
committerMåns Rullgård <mans@mansr.com>2008-03-05 21:27:58 +0000
commitde2f77d865e7400c9bf5839ca0952f2aa532677c (patch)
tree986222f1c00b561334e708596d51f53c59a72946 /common.mak
parente3773a55bed603f648087abdb300f003d7e7fb46 (diff)
allow vpath search only for source files
Originally committed as revision 12343 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak11
1 files changed, 8 insertions, 3 deletions
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)