diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-03-15 19:24:03 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-03-15 19:24:03 +0000 |
| commit | c415857d06fe11fa864f54c249a3552fbf6ef5d8 (patch) | |
| tree | 01494fc9a0acb454714eeae93125bab18ce764d6 /common.mak | |
| parent | e6a383d69519fa919815ceeb64ca3eec1d59ea9f (diff) | |
rename LIBSRC to SRC_DIR, add quotes where SRC_DIR was used
Originally committed as revision 12452 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/common.mak b/common.mak index 359aa119c8..e4e005f03f 100644 --- a/common.mak +++ b/common.mak @@ -2,16 +2,14 @@ # common bits used by all libraries # -LIBSRC = $(SRC_PATH_BARE)/lib$(NAME) +SRC_DIR = $(SRC_PATH_BARE)/lib$(NAME) LIBVERSION = $(lib$(NAME)_VERSION) LIBMAJOR = $(lib$(NAME)_VERSION_MAJOR) -vpath %.c $(LIBSRC) -vpath %.h $(LIBSRC) -vpath %.S $(LIBSRC) - -SRC_DIR = "$(LIBSRC)" +vpath %.c $(SRC_DIR) +vpath %.h $(SRC_DIR) +vpath %.S $(SRC_DIR) ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale @@ -58,7 +56,7 @@ $(SLIBNAME_WITH_MAJOR): $(OBJS) %.ho: %.h $(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $< -ALLHEADERS = $(subst $(LIBSRC)/,,$(wildcard $(LIBSRC)/*.h)) +ALLHEADERS = $(subst $(SRC_DIR)/,,$(wildcard $(SRC_DIR)/*.h)) checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho)) depend dep: $(SRCS) @@ -98,7 +96,7 @@ INCINSTDIR = $(INCDIR)/lib$(NAME) install-headers: install -d "$(INCINSTDIR)" install -d "$(LIBDIR)/pkgconfig" - install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCINSTDIR)" + install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)" install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig" uninstall: uninstall-libs uninstall-headers |