X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2FMakefile.am;h=3bc9146c6b5aaa1426ebf169bd542ea09f6b2ec6;hb=9d73a00bb9b06de00059407b813fdc8bfa7a2255;hp=f632a3f7ac978a68c5b3375df0e9bf9d8b02ad02;hpb=63e2f5f198e2328c8f54f8b192d13c85a062f2c9;p=vlc

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index f632a3f7ac..3bc9146c6b 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -1,6 +1,5 @@
 accessdir = $(pluginsdir)/access
 access_LTLIBRARIES =
-EXTRA_LTLIBRARIES =
 
 AM_CPPFLAGS += -I$(srcdir)/access
 
@@ -135,6 +134,7 @@ liblinsys_hdsdi_plugin_la_SOURCES = \
 	access/linsys/linsys_sdivideo.h \
 	access/linsys/linsys_hdsdi.c
 liblinsys_hdsdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
+liblinsys_hdsdi_plugin_la_LIBADD = $(LIBPTHREAD)
 liblinsys_sdi_plugin_la_SOURCES = access/linsys/linsys_sdi.c access/linsys/linsys_sdi.h
 liblinsys_sdi_plugin_la_CFLAGS = $(AM_CFLAGS) $(LINSYS_SDI_CFLAGS)
 liblinsys_sdi_plugin_la_LIBADD = $(LINSYS_SDI_LIBS)
@@ -144,7 +144,7 @@ EXTRA_LTLIBRARIES += liblinsys_hdsdi_plugin.la liblinsys_sdi_plugin.la
 
 libdecklink_plugin_la_SOURCES = access/decklink.cpp access/sdi.c access/sdi.h
 libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklink)
-libdecklink_plugin_la_LIBADD = $(LIBS_decklink) -ldl
+libdecklink_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL) -lpthread
 if HAVE_DECKLINK
 access_LTLIBRARIES += libdecklink_plugin.la
 endif
@@ -184,8 +184,10 @@ libdshow_plugin_la_SOURCES = access/dshow/vlc_dshow.h access/dshow/dshow.cpp acc
 	access/dshow/filter.cpp access/dshow/filter.h access/dshow/crossbar.cpp
 libdshow_plugin_la_LIBADD = -lole32 -loleaut32 -luuid -lstrmiids -lksuser
 if HAVE_WIN32
+if !HAVE_WINSTORE
 access_LTLIBRARIES += libdshow_plugin.la
 endif
+endif
 
 
 ### Screen grab ###
@@ -216,10 +218,12 @@ endif
 libscreen_plugin_la_SOURCES = access/screen/screen.c access/screen/screen.h
 libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 if HAVE_WIN32
+if !HAVE_WINSTORE
 libscreen_plugin_la_SOURCES += access/screen/win32.c
 libscreen_plugin_la_LIBADD = -lgdi32
 access_LTLIBRARIES += libscreen_plugin.la
 endif
+endif
 if HAVE_MAC_SCREEN
 libscreen_plugin_la_SOURCES += access/screen/mac.c
 libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices"
@@ -330,6 +334,7 @@ access_LTLIBRARIES += libdtv_plugin.la
 endif
 
 if HAVE_WIN32
+if !HAVE_WINSTORE
 # Work-around automake bug:
 # Use an import library for C++ to retain C linker on other platforms.
 libbda_la_SOURCES = access/dtv/bdadefs.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
@@ -341,6 +346,7 @@ libdtv_plugin_la_DEPENDENCIES = libbda.la
 libdtv_plugin_la_LIBADD = libbda.la -lstdc++
 access_LTLIBRARIES += libdtv_plugin.la
 endif
+endif
 
 # Old Linux DVB scanner
 libdvb_plugin_la_SOURCES = \
@@ -407,8 +413,7 @@ libsmb_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
 access_LTLIBRARIES += $(LTLIBsmb)
 EXTRA_LTLIBRARIES += libsmb_plugin.la
 
-libdsm_plugin_la_SOURCES = access/dsm/access.c access/dsm/common.h \
-	access/dsm/browser.c access/dsm/sd.c
+libdsm_plugin_la_SOURCES = access/dsm/access.c access/dsm/sd.c
 libdsm_plugin_la_CFLAGS = $(AM_CFLAGS) $(DSM_CFLAGS)
 libdsm_plugin_la_LIBADD = $(DSM_LIBS)
 libdsm_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'