[vlc-commits] skins2: Remove Modules.am

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan 12 15:09:55 2017 +0200| [2ce951f06fad52360a30c6eb26ed710fa71c494c] | committer: Rémi Denis-Courmont

skins2: Remove Modules.am

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2ce951f06fad52360a30c6eb26ed710fa71c494c
---

 bootstrap                                      |  2 +-
 configure.ac                                   |  4 ----
 modules/gui/skins2/.gitignore                  |  1 -
 modules/gui/skins2/{Modules.am => Makefile.am} | 19 +++++++++++++++----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/bootstrap b/bootstrap
index 76a93e1..ff4cfd2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -66,7 +66,7 @@ for d in modules/*/*/Modules.am; do
 	d="${d%/Modules.am}"
 	${CONFIG_SHELL-sh} modules/genmf "$d"
 	printf "."
-done
+done || true
 printf "\n"
 
 set -x
diff --git a/configure.ac b/configure.ac
index 9db62c9..750f1cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3823,9 +3823,6 @@ AS_IF([test "${enable_skins2}" != "no"], [
     VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} ${XINERAMA_LIBS} -lX11])
   ])
 
-  dnl for All OSes
-  VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
-
   dnl we need freetype
   AS_IF([test "${have_freetype}" != "yes"], [
     have_skins_deps="no"
@@ -3839,7 +3836,6 @@ AS_IF([test "${enable_skins2}" != "no"], [
     ])
     enable_skins2="no"
   ], [
-    VLC_ADD_PLUGIN([skins2])
     ALIASES="${ALIASES} svlc"
     enable_skins2="yes"
   ])
diff --git a/modules/gui/skins2/.gitignore b/modules/gui/skins2/.gitignore
deleted file mode 100644
index 08a6d72..0000000
--- a/modules/gui/skins2/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Makefile.am
similarity index 93%
rename from modules/gui/skins2/Modules.am
rename to modules/gui/skins2/Makefile.am
index 1599907..45b942d 100644
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Makefile.am
@@ -1,4 +1,7 @@
-SOURCES_skins2 = \
+include $(top_srcdir)/modules/common.am
+guidir = $(pluginsdir)/gui
+
+libskins2_plugin_la_SOURCES = \
 	commands/async_queue.cpp \
 	commands/async_queue.hpp \
 	commands/cmd_add_item.cpp \
@@ -196,7 +199,7 @@ SOURCES_skins2 = \
 	vars/volume.hpp
 
 if HAVE_WIN32
-SOURCES_skins2 += \
+libskins2_plugin_la_SOURCES += \
 	win32/win32_dragdrop.cpp \
 	win32/win32_dragdrop.hpp \
 	win32/win32_factory.cpp \
@@ -216,7 +219,7 @@ SOURCES_skins2 += \
     $(NULL)
 else
 if HAVE_OS2
-SOURCES_skins2 += \
+libskins2_plugin_la_SOURCES += \
 	os2/os2_dragdrop.cpp \
 	os2/os2_dragdrop.hpp \
 	os2/os2_factory.cpp \
@@ -235,7 +238,7 @@ SOURCES_skins2 += \
 	os2/os2_window.hpp \
     $(NULL)
 else
-SOURCES_skins2 += \
+libskins2_plugin_la_SOURCES += \
 	x11/x11_display.cpp \
 	x11/x11_display.hpp \
 	x11/x11_dragdrop.cpp \
@@ -257,3 +260,11 @@ SOURCES_skins2 += \
     $(NULL)
 endif
 endif
+
+libskins2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_skins2)
+libskins2_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -O2 -fno-rtti
+libskins2_plugin_la_LIBADD = $(LIBS_skins2)
+
+if BUILD_SKINS
+gui_LTLIBRARIES = libskins2_plugin.la
+endif