Remove recursion into modules/access/screen/

configure.ac

@@ -1911,9 +1911,6 @@ if test "${enable_screen}" != "no"; then
         VLC_ADD_LIBS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices])
       ])
     ])
-  elif test "${SYS}" = "mingw32"; then
-    VLC_ADD_PLUGIN([screen])
-    VLC_ADD_LIBS([screen],[-lgdi32])
   fi
 fi
 
@@ -4135,7 +4132,6 @@ AC_CONFIG_FILES([
   modules/access/rtp/Makefile
   modules/access/vcd/Makefile
   modules/access/vcdx/Makefile
-  modules/access/screen/Makefile
   modules/access/zip/Makefile
   modules/access/zip/unzip/Makefile
   modules/access_output/Makefile

modules/access/Modules.am

-SUBDIRS = mms rtp screen vcd vcdx zip
+SUBDIRS = mms rtp vcd vcdx zip
 
 libfilesystem_plugin_la_SOURCES = \
 	fs.h \
@@ -145,6 +145,19 @@ if HAVE_XCB
 libvlc_LTLIBRARIES += libxcb_screen_plugin.la
 endif
 
+libscreen_plugin_la_SOURCES = screen/screen.c screen/screen.h
+libscreen_plugin_la_CFLAGS = $(AM_CFLAGS)
+libscreen_plugin_la_LIBADD = $(AM_LIBADD)
+if HAVE_WIN32
+libscreen_plugin_la_SOURCES += screen/win32.c
+libscreen_plugin_la_LIBADD += -lgdi32
+libvlc_LTLIBRARIES += libscreen_plugin.la
+endif
+if HAVE_DARWIN
+libscreen_plugin_la_SOURCES += screen/mac.c
+libvlc_LTLIBRARIES += $(LTLIBscreen)
+endif
+
 
 ### Optical media ###
 

modules/access/screen/Modules.am

-if HAVE_WIN32
-screen_extra = win32.c
-else
-if HAVE_DARWIN
-screen_extra = mac.c
-endif
-endif
-SOURCES_screen = \
-        screen.c \
-        screen.h \
-        $(screen_extra) \
-        $(NULL)