diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-09 14:58:25 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-09 14:58:25 +0000 |
| commit | d8e117ddfe5a27b6588c5f04b52f8d48eff66b3f (patch) | |
| tree | 2044b74534a4816437075f6e855ede11fb4f3cde | |
| parent | 1afc4750efb03dfb082348f82bd468bd0ab9cefd (diff) | |
| download | ffmpeg-d8e117ddfe5a27b6588c5f04b52f8d48eff66b3f.tar.gz | |
Remove superflous ifdef CONFIG_{STATIC,SHARED} in makefiles
Originally committed as revision 22396 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | subdir.mak | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/subdir.mak b/subdir.mak index 3dd9f43bfb..aba2fe0c2f 100644 --- a/subdir.mak +++ b/subdir.mak @@ -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) $(SUBDIR)lib$(NAME).ver ifdef SUBDIR $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS) endif -endif install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) $(Q)mkdir -p "$(SHLIBDIR)" |