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
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
if BUILD_ACTIVEX
axvlc_DATA = axvlc$(LIBEXT)
axvlcdir = $(libdir)
-LDFLAGS_activex = `$(VLC_CONFIG) --libs activex vlc builtin`
+LDFLAGS_activex = `$(VLC_CONFIG) --libs activex libvlc`
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)
+libaxvlc_a_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
- $(libaxvlc_a_DEPENDENCIES) stamp-pic
+ $(libaxvlc_a_DEPENDENCIES)
$(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
$(srcdir)/axvlc.def \
$(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
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
+clean-local: clean-tlb
rm -f axvlc$(LIBEXT)
###############################################################################