git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/asa-git.diff

   1 diff -ur asa.orig/lib/Makefile.am asa/lib/Makefile.am
   2 --- asa.orig/lib/Makefile.am    2007-08-31 17:26:54.000000000 +0200
   3 +++ asa/lib/Makefile.am 2008-03-08 23:17:27.000000000 +0100
   4 @@ -25,7 +25,9 @@
   5         echo obj $(objname) pic $(picname)
   6         $(NASM) -f elf $(ASMOPT) -o ${picname} $^
   7         $(NASM) -f elf $(ASMOPT) -DNO_PIC -o ${objname} $^
   8 -       echo -e "# Generated by libtool\npic_object='../${picname}'\nnon_pic_object='../${objname}'" > $@
   9 +       echo "# Generated by libtool" > $@
  10 +       echo "pic_object='../${picname}'" >> $@
  11 +       echo "non_pic_object='../${objname}'" >> $@
  12
  13  noinst_HEADERS = blitter_internal.h
  14  lib_LTLIBRARIES = libasa.la
  15 @@ -51,11 +53,12 @@
  16         ../csri/subhelp/libsubhelp_la-openfile.lo \
  17         ../csri/subhelp/libsubhelp_la-logging.lo \
  18         import/libimport.la \
  19 +       $(PCRE_LIBS) \
  20         $(ASM)
  21  libasa_la_LDFLAGS = -version-info 0:0:0 -no-undefined
  22
  23  install-exec-hook:
  24 -       test -z "$(csrilibdir)" || $(MKDIR_P) "$(DESTDIR)$(csrilibdir)"
  25 +       test -z "$(csrilibdir)" || $(mkdir_p) "$(DESTDIR)$(csrilibdir)"
  26         $(LN_S) $(libdir)/libasa.so.0 \
  27                 $(DESTDIR)$(csrilibdir)/asa_csri.so
  28
  29 diff -ur asa.orig/lib/import/Makefile.am asa/lib/import/Makefile.am
  30 --- asa.orig/lib/import/Makefile.am     2007-08-31 17:26:54.000000000 +0200
  31 +++ asa/lib/import/Makefile.am  2008-03-08 23:01:50.000000000 +0100
  32 @@ -1,6 +1,6 @@
  33  if IMPORTS_PREP
  34  noinst_PROGRAMS = preparse
  35 -preparse_LDFLAGS = -limportparser
  36 +preparse_LDFLAGS = -limportparser $(PCRE_LIBS)
  37
  38  BUILT_SOURCES = imports_prep.h
  39  imports_prep.h: $(srcdir)/imports libimportparser.la preparse