# Building the Activex plugin
###############################################################################
-noinst_LIBRARIES = $(noinst_LIBRARIES_activex)
-
-MOSTLYCLEANFILES = $(LIBRARIES_activex)
+MOSTLYCLEANFILES =
EXTRA_DIST = $(SOURCES_activex) $(DIST_rsrc) $(DIST_misc)
BUILT_SOURCES = $(BUILT_SOURCES_activex)
dataobject.h \
viewobject.cpp \
viewobject.h \
+ supporterrorinfo.cpp \
+ supporterrorinfo.h \
vlccontrol.cpp \
vlccontrol.h \
- vlcconfiguration.cpp \
- vlcconfiguration.h \
vlccontrol2.cpp \
vlccontrol2.h \
plugin.cpp \
plugin.h \
axvlc_idl.c \
axvlc_idl.h \
+ guiddef.h \
$(NULL)
DIST_rsrc = \
test.html \
$(NULL)
-if BUILD_SHARED
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll
-else
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
-endif
-
if BUILD_ACTIVEX
-noinst_LIBRARIES_activex = libaxvlc.a
-axvlc_DATA = axvlc$(LIBEXT)
-axvlcdir = $(libdir)
-
-LDFLAGS_activex = `$(VLC_CONFIG) --libs activex vlc builtin`
+lib_LTLIBRARIES = axvlc.la
-libaxvlc_a_SOURCES = $(SOURCES_activex) $(SOURCE_dll)
-libaxvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags activex`
-libaxvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags activex`
-libaxvlc_a_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc)
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \
+ $(top_builddir)/src/libvlc.la
-axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
- $(libaxvlc_a_DEPENDENCIES) stamp-pic
- $(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
- $(srcdir)/axvlc.def \
- $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
- $(INCLUDED_LIBINTL)
-# Cygwin work-around
- @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
+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 -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 =
+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 $@
DATA_axvlc_tlb = $(axvlc_tlb_DATA)
noinst_axvlc_tlb_DATA = axvlc.tlb
endif
endif
-DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
-noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
-noinst_axvlc_rcdir = $(libdir)
-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 $@
-
else
clean-tlb:
endif
-###############################################################################
-# Stamp rules
-###############################################################################
-
-clean-stamp:
- rm -f stamp-pic
-
-if BUILD_SHARED
-stamp-pic:
-else
-stamp-pic: $(shell ${VLC_CONFIG} --target builtin)
-endif
- @touch $@
-
-
###############################################################################
# Clean rules
###############################################################################
-clean-local: clean-stamp clean-tlb
- rm -f axvlc$(LIBEXT)
+clean-local: clean-tlb
###############################################################################
# Force rules