diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/faad2/patches/patch-frontend_Makefile_am | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/faad2/patches/patch-frontend_Makefile_am')
| -rw-r--r-- | package/faad2/patches/patch-frontend_Makefile_am | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/package/faad2/patches/patch-frontend_Makefile_am b/package/faad2/patches/patch-frontend_Makefile_am deleted file mode 100644 index e0efa1aca..000000000 --- a/package/faad2/patches/patch-frontend_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- faad2.orig/frontend/Makefile.am 2006-05-07 20:09:00.000000000 +0200 -+++ faad2/frontend/Makefile.am 2009-01-11 17:16:19.901544559 +0100 -@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(t - -I$(top_srcdir)/common/mp4ff - - faad_LDADD = $(top_builddir)/libfaad/libfaad.la \ -- $(top_builddir)/common/mp4ff/libmp4ff.la -+ $(top_builddir)/common/mp4ff/libmp4ff.a - - faad_SOURCES = main.c \ - audio.c audio.h \ |