[FFmpeg-cvslog] r22396 - trunk/subdir.mak

mru subversion
Tue Mar 9 15:58:26 CET 2010


Author: mru
Date: Tue Mar  9 15:58:25 2010
New Revision: 22396

Log:
Remove superflous ifdef CONFIG_{STATIC,SHARED} in makefiles

Modified:
   trunk/subdir.mak

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	Tue Mar  9 15:58:22 2010	(r22395)
+++ trunk/subdir.mak	Tue Mar  9 15:58:25 2010	(r22396)
@@ -22,12 +22,10 @@ $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
 
 $(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H
 
-ifdef CONFIG_STATIC
 $(SUBDIR)$(LIBNAME): $(OBJS)
 	$(RM) $@
 	$(AR) rc $@ $^ $(EXTRAOBJS)
 	$(RANLIB) $@
-endif
 
 install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
 
@@ -47,7 +45,6 @@ distclean:: clean
 	$(RM)  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
             $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 
-ifdef CONFIG_SHARED
 $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
 	$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
 
@@ -59,7 +56,6 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
 ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
 endif
-endif
 
 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
 	$(Q)mkdir -p "$(SHLIBDIR)"



More information about the ffmpeg-cvslog mailing list