replace some ifeq with prettier ifdef
authorMåns Rullgård <mans@mansr.com>
Mon, 7 Apr 2008 22:17:47 +0000 (22:17 +0000)
committerMåns Rullgård <mans@mansr.com>
Mon, 7 Apr 2008 22:17:47 +0000 (22:17 +0000)
Originally committed as revision 12764 to svn://svn.ffmpeg.org/ffmpeg/trunk

common.mak
libavcodec/Makefile
subdir.mak

index 66297ef..62dddcd 100644 (file)
@@ -4,7 +4,7 @@
 
 all: # make "all" default target
 
 
 all: # make "all" default target
 
-ifeq ($(SUBDIR),)
+ifndef SUBDIR
 vpath %.c $(SRC_DIR)
 vpath %.h $(SRC_DIR)
 vpath %.S $(SRC_DIR)
 vpath %.c $(SRC_DIR)
 vpath %.h $(SRC_DIR)
 vpath %.S $(SRC_DIR)
index 3652464..a47f04b 100644 (file)
@@ -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
 endif
 
 # processor-specific code
 OBJS += imgresample.o
 endif
 
 # processor-specific code
-ifeq ($(HAVE_MMX),yes)
+ifdef HAVE_MMX
 OBJS += i386/fdct_mmx.o \
         i386/cputest.o \
         i386/dsputil_mmx.o \
 OBJS += i386/fdct_mmx.o \
         i386/cputest.o \
         i386/dsputil_mmx.o \
index 6384d8b..5b92f78 100644 (file)
@@ -19,7 +19,7 @@ endif
 INCINSTDIR := $(INCDIR)/lib$(NAME)
 
 define RULES
 INCINSTDIR := $(INCDIR)/lib$(NAME)
 
 define RULES
-ifeq ($(BUILD_SHARED),yes)
+ifdef BUILD_SHARED
 all: $(SUBDIR)$(SLIBNAME)
 
 install-libs: install-lib$(NAME)-shared
 all: $(SUBDIR)$(SLIBNAME)
 
 install-libs: install-lib$(NAME)-shared
@@ -32,7 +32,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
        $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS)
        $(SLIB_EXTRA_CMD)
 
        $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS)
        $(SLIB_EXTRA_CMD)
 
-ifneq ($(SUBDIR),)
+ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
     $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF))
 endif
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
     $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF))
 endif