libupnp: Don't unescape XML twice. Patch by Robson Braga Araujo

[vlc] / activex / Makefile.am

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 47b79bbf50afec564a961a07e316fa8a0167365f..a0ef44bef992ee271bc6c2b3828e7b1663d21479 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -73,14 +73,15 @@ axvlc_la_SOURCES = $(SOURCES_activex)
 axvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags activex`
 axvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags activex`
 axvlc_la_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
-axvlc_la_LDFLAGS = $(srcdir)/axvlc.def -Wl,$(DATA_axvlc_rc) \
-    -no-undefined -avoid-version $(LIBRARIES_libvlc) \
-    `$(VLC_CONFIG) --libs activex libvlc` \
-       -module
+axvlc_la_LDFLAGS = -Wl,$(srcdir)/axvlc.def -Wl,$(DATA_axvlc_rc) \
+    -no-undefined -avoid-version -module \
+    `$(VLC_CONFIG) --ldflags activex libvlc`
+axvlc_la_LIBADD = $(LIBRARIES_libvlc) \
+       `$(VLC_CONFIG) -libs activex`
 
 DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
 noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
-noinst_axvlc_rcdir = $(libdir)
+noinst_axvlc_rcdir = 
 axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp axvlc.tlb
        $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/[^0-9]*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@