Commit 6d93e256 authored by mru's avatar mru

replace some ifeq with prettier ifdef


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12764 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent db791c73
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
all: # make "all" default target all: # make "all" default target
ifeq ($(SUBDIR),) ifndef SUBDIR
vpath %.c $(SRC_DIR) vpath %.c $(SRC_DIR)
vpath %.h $(SRC_DIR) vpath %.h $(SRC_DIR)
vpath %.S $(SRC_DIR) vpath %.S $(SRC_DIR)
......
...@@ -362,12 +362,12 @@ OBJS-$(HAVE_W32THREADS) += w32thread.o ...@@ -362,12 +362,12 @@ OBJS-$(HAVE_W32THREADS) += w32thread.o
OBJS-$(HAVE_XVMC) += xvmcvideo.o OBJS-$(HAVE_XVMC) += xvmcvideo.o
ifneq ($(CONFIG_SWSCALE),yes) ifndef CONFIG_SWSCALE
OBJS += imgresample.o OBJS += imgresample.o
endif endif
# processor-specific code # processor-specific code
ifeq ($(HAVE_MMX),yes) ifdef HAVE_MMX
OBJS += i386/fdct_mmx.o \ OBJS += i386/fdct_mmx.o \
i386/cputest.o \ i386/cputest.o \
i386/dsputil_mmx.o \ i386/dsputil_mmx.o \
......
...@@ -19,7 +19,7 @@ endif ...@@ -19,7 +19,7 @@ endif
INCINSTDIR := $(INCDIR)/lib$(NAME) INCINSTDIR := $(INCDIR)/lib$(NAME)
define RULES define RULES
ifeq ($(BUILD_SHARED),yes) ifdef BUILD_SHARED
all: $(SUBDIR)$(SLIBNAME) all: $(SUBDIR)$(SLIBNAME)
install-libs: install-lib$(NAME)-shared install-libs: install-lib$(NAME)-shared
...@@ -32,7 +32,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) ...@@ -32,7 +32,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
$(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS) $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS)
$(SLIB_EXTRA_CMD) $(SLIB_EXTRA_CMD)
ifneq ($(SUBDIR),) ifdef SUBDIR
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): \ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
$(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF)) $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF))
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment