rename LIBSRC to SRC_DIR, add quotes where SRC_DIR was used

Originally committed as revision 12452 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Måns Rullgård 17 years ago
parent e6a383d695
commit c415857d06
  1. 14
      common.mak

@ -2,16 +2,14 @@
# common bits used by all libraries # common bits used by all libraries
# #
LIBSRC = $(SRC_PATH_BARE)/lib$(NAME) SRC_DIR = $(SRC_PATH_BARE)/lib$(NAME)
LIBVERSION = $(lib$(NAME)_VERSION) LIBVERSION = $(lib$(NAME)_VERSION)
LIBMAJOR = $(lib$(NAME)_VERSION_MAJOR) LIBMAJOR = $(lib$(NAME)_VERSION_MAJOR)
vpath %.c $(LIBSRC) vpath %.c $(SRC_DIR)
vpath %.h $(LIBSRC) vpath %.h $(SRC_DIR)
vpath %.S $(LIBSRC) vpath %.S $(SRC_DIR)
SRC_DIR = "$(LIBSRC)"
ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
@ -58,7 +56,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 $(LIBSRC)/,,$(wildcard $(LIBSRC)/*.h)) ALLHEADERS = $(subst $(SRC_DIR)/,,$(wildcard $(SRC_DIR)/*.h))
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho)) checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
depend dep: $(SRCS) depend dep: $(SRCS)
@ -98,7 +96,7 @@ INCINSTDIR = $(INCDIR)/lib$(NAME)
install-headers: install-headers:
install -d "$(INCINSTDIR)" install -d "$(INCINSTDIR)"
install -d "$(LIBDIR)/pkgconfig" 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" install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
uninstall: uninstall-libs uninstall-headers uninstall: uninstall-libs uninstall-headers

Loading…
Cancel
Save