[FFmpeg-cvslog] r12764 - in trunk: common.mak libavcodec/Makefile subdir.mak

mru subversion
Tue Apr 8 00:17:47 CEST 2008


Author: mru
Date: Tue Apr  8 00:17:47 2008
New Revision: 12764

Log:
replace some ifeq with prettier ifdef


Modified:
   trunk/common.mak
   trunk/libavcodec/Makefile
   trunk/subdir.mak

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Tue Apr  8 00:17:47 2008
@@ -4,7 +4,7 @@
 
 all: # make "all" default target
 
-ifeq ($(SUBDIR),)
+ifndef SUBDIR
 vpath %.c $(SRC_DIR)
 vpath %.h $(SRC_DIR)
 vpath %.S $(SRC_DIR)

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Tue Apr  8 00:17:47 2008
@@ -362,12 +362,12 @@ OBJS-$(HAVE_W32THREADS)                +
 
 OBJS-$(HAVE_XVMC)                      += xvmcvideo.o
 
-ifneq ($(CONFIG_SWSCALE),yes)
+ifndef CONFIG_SWSCALE
 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 \

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	(original)
+++ trunk/subdir.mak	Tue Apr  8 00:17:47 2008
@@ -19,7 +19,7 @@ endif
 INCINSTDIR := $(INCDIR)/lib$(NAME)
 
 define RULES
-ifeq ($(BUILD_SHARED),yes)
+ifdef BUILD_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)
 
-ifneq ($(SUBDIR),)
+ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
     $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF))
 endif




More information about the ffmpeg-cvslog mailing list