d5240098e3
update needed for newer x264 and for gcc4. this causes yet more fallout as some libav* functions other ports were using have been fully deprecated. commits coming rsn ... mostly from new MAINTAINER
24 lines
988 B
Plaintext
24 lines
988 B
Plaintext
$OpenBSD: patch-subdir_mak,v 1.2 2010/05/26 21:38:52 jakemsr Exp $
|
|
--- subdir.mak.orig Tue May 11 19:21:00 2010
|
|
+++ subdir.mak Wed May 12 19:51:20 2010
|
|
@@ -41,7 +41,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
|
|
|
|
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
|
|
$(SLIB_CREATE_DEF_CMD)
|
|
- $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
|
|
+ $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(LIB$(NAME)_EXTRALIBS) $(EXTRAOBJS)
|
|
$(SLIB_EXTRA_CMD)
|
|
|
|
ifdef SUBDIR
|
|
@@ -61,10 +61,6 @@ install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
|
|
$(Q)mkdir -p "$(SHLIBDIR)"
|
|
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
|
$$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
|
- $(Q)cd "$(SHLIBDIR)" && \
|
|
- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
|
|
- $(Q)cd "$(SHLIBDIR)" && \
|
|
- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
|
|
$(SLIB_INSTALL_EXTRA_CMD)
|
|
|
|
install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
|