[vlc-commits] gui: remove Makefile recursion
Rémi Denis-Courmont
git at videolan.org
Thu Feb 12 07:17:49 CET 2015
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 11 18:10:34 2015 +0200| [8e0cc7ed30f1d33e38231206a7e7537c08bf799c] | committer: Rémi Denis-Courmont
gui: remove Makefile recursion
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8e0cc7ed30f1d33e38231206a7e7537c08bf799c
---
configure.ac | 9 ++++---
modules/Makefile.am | 2 +-
modules/gui/.gitignore | 1 -
modules/gui/Makefile.am | 32 +++++++++++++++++++++++++
modules/gui/Modules.am | 24 -------------------
modules/gui/ios_dialog_provider/.gitignore | 32 +++++++++++++++++++++++++
modules/gui/macosx/.gitignore | 32 +++++++++++++++++++++++++
modules/gui/macosx_dialog_provider/.gitignore | 32 +++++++++++++++++++++++++
modules/gui/minimal_macosx/.gitignore | 32 +++++++++++++++++++++++++
modules/gui/skins2/.gitignore | 32 +++++++++++++++++++++++++
10 files changed, 197 insertions(+), 31 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9e15cb9..74c6f15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -699,7 +699,7 @@ AC_CHECK_FUNC(getopt_long,, [
AC_SUBST(GNUGETOPT_LIBS)
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LIBS([x264 goom swscale mpc qt4 x262 x26410b ncurses glspectrum smooth],[-lm])
+ VLC_ADD_LIBS([x264 goom swscale mpc qt4 x262 x26410b glspectrum smooth],[-lm])
LIBM="-lm"
], [
LIBM=""
@@ -3805,11 +3805,10 @@ dnl ncurses module
dnl
AC_ARG_ENABLE(ncurses,
[AS_HELP_STRING([--disable-ncurses],[ncurses text-based interface (default auto)])])
+have_ncurses="no"
AS_IF([test "${enable_ncurses}" != "no"] ,[
PKG_CHECK_MODULES([NCURSES], [ncursesw], [
- VLC_ADD_PLUGIN([ncurses])
- VLC_ADD_CFLAGS([ncurses],[${NCURSES_CFLAGS}])
- VLC_ADD_LIBS([ncurses],[${NCURSES_LIBS} ${LIBPTHREAD}])
+ have_ncurses="yes"
ALIASES="${ALIASES} nvlc"
], [
AS_IF([test -n "${enable_ncurses}"], [
@@ -3817,6 +3816,7 @@ AS_IF([test "${enable_ncurses}" != "no"] ,[
])
])
])
+AM_CONDITIONAL([HAVE_NCURSES], [test "${have_ncurses}" = "yes"])
dnl
dnl Lirc plugin
@@ -4131,7 +4131,6 @@ AC_CONFIG_FILES([
bin/Makefile
test/Makefile
modules/access_output/Makefile
- modules/gui/Makefile
modules/gui/ios_dialog_provider/Makefile
modules/gui/macosx/Makefile
modules/gui/minimal_macosx/Makefile
diff --git a/modules/Makefile.am b/modules/Makefile.am
index c21c60b..5956c78 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -4,7 +4,6 @@ check_PROGRAMS =
EXTRA_DIST =
BASE_SUBDIRS = \
- gui \
visualization
EXTRA_SUBDIRS = \
access_output \
@@ -36,6 +35,7 @@ include audio_output/Makefile.am
include codec/Makefile.am
include control/Makefile.am
include demux/Makefile.am
+include gui/Makefile.am
include hw/vdpau/Makefile.am
include logger/Makefile.am
include lua/Makefile.am
diff --git a/modules/gui/.gitignore b/modules/gui/.gitignore
deleted file mode 100644
index 08a6d72..0000000
--- a/modules/gui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/gui/Makefile.am b/modules/gui/Makefile.am
new file mode 100644
index 0000000..6ccc850
--- /dev/null
+++ b/modules/gui/Makefile.am
@@ -0,0 +1,32 @@
+guidir = $(pluginsdir)/gui
+gui_LTLIBRARIES =
+
+DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider gui/ios_dialog_provider
+
+if ENABLE_MACOSX_UI
+SUBDIRS += gui/macosx
+endif
+if ENABLE_MACOSX_DIALOG_PROVIDER
+SUBDIRS += gui/macosx_dialog_provider
+endif
+if HAVE_IOS
+SUBDIRS += gui/ios_dialog_provider
+endif
+if ENABLE_MINIMAL_MACOSX
+SUBDIRS += gui/minimal_macosx
+endif
+if ENABLE_QT4
+SUBDIRS += gui/qt4
+endif
+if BUILD_SKINS
+SUBDIRS += gui/skins2
+endif
+
+libncurses_plugin_la_SOURCES = gui/ncurses.c
+libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
+libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
+if HAVE_NCURSES
+gui_LTLIBRARIES += libncurses_plugin.la
+endif
+
+EXTRA_DIST += gui/eject.c
diff --git a/modules/gui/Modules.am b/modules/gui/Modules.am
deleted file mode 100644
index 2787352..0000000
--- a/modules/gui/Modules.am
+++ /dev/null
@@ -1,24 +0,0 @@
-DIST_SUBDIRS = macosx minimal_macosx qt4 skins2 macosx_dialog_provider ios_dialog_provider
-SUBDIRS =
-
-if ENABLE_MACOSX_UI
-SUBDIRS += macosx
-endif
-if ENABLE_MACOSX_DIALOG_PROVIDER
-SUBDIRS += macosx_dialog_provider
-endif
-if HAVE_IOS
-SUBDIRS += ios_dialog_provider
-endif
-if ENABLE_MINIMAL_MACOSX
-SUBDIRS += minimal_macosx
-endif
-if ENABLE_QT4
-SUBDIRS += qt4
-endif
-if BUILD_SKINS
-SUBDIRS += skins2
-endif
-
-SOURCES_ncurses = ncurses.c
-EXTRA_DIST += eject.c
diff --git a/modules/gui/ios_dialog_provider/.gitignore b/modules/gui/ios_dialog_provider/.gitignore
new file mode 100644
index 0000000..6ccc850
--- /dev/null
+++ b/modules/gui/ios_dialog_provider/.gitignore
@@ -0,0 +1,32 @@
+guidir = $(pluginsdir)/gui
+gui_LTLIBRARIES =
+
+DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider gui/ios_dialog_provider
+
+if ENABLE_MACOSX_UI
+SUBDIRS += gui/macosx
+endif
+if ENABLE_MACOSX_DIALOG_PROVIDER
+SUBDIRS += gui/macosx_dialog_provider
+endif
+if HAVE_IOS
+SUBDIRS += gui/ios_dialog_provider
+endif
+if ENABLE_MINIMAL_MACOSX
+SUBDIRS += gui/minimal_macosx
+endif
+if ENABLE_QT4
+SUBDIRS += gui/qt4
+endif
+if BUILD_SKINS
+SUBDIRS += gui/skins2
+endif
+
+libncurses_plugin_la_SOURCES = gui/ncurses.c
+libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
+libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
+if HAVE_NCURSES
+gui_LTLIBRARIES += libncurses_plugin.la
+endif
+
+EXTRA_DIST += gui/eject.c
diff --git a/modules/gui/macosx/.gitignore b/modules/gui/macosx/.gitignore
new file mode 100644
index 0000000..6ccc850
--- /dev/null
+++ b/modules/gui/macosx/.gitignore
@@ -0,0 +1,32 @@
+guidir = $(pluginsdir)/gui
+gui_LTLIBRARIES =
+
+DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider gui/ios_dialog_provider
+
+if ENABLE_MACOSX_UI
+SUBDIRS += gui/macosx
+endif
+if ENABLE_MACOSX_DIALOG_PROVIDER
+SUBDIRS += gui/macosx_dialog_provider
+endif
+if HAVE_IOS
+SUBDIRS += gui/ios_dialog_provider
+endif
+if ENABLE_MINIMAL_MACOSX
+SUBDIRS += gui/minimal_macosx
+endif
+if ENABLE_QT4
+SUBDIRS += gui/qt4
+endif
+if BUILD_SKINS
+SUBDIRS += gui/skins2
+endif
+
+libncurses_plugin_la_SOURCES = gui/ncurses.c
+libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
+libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
+if HAVE_NCURSES
+gui_LTLIBRARIES += libncurses_plugin.la
+endif
+
+EXTRA_DIST += gui/eject.c
diff --git a/modules/gui/macosx_dialog_provider/.gitignore b/modules/gui/macosx_dialog_provider/.gitignore
new file mode 100644
index 0000000..6ccc850
--- /dev/null
+++ b/modules/gui/macosx_dialog_provider/.gitignore
@@ -0,0 +1,32 @@
+guidir = $(pluginsdir)/gui
+gui_LTLIBRARIES =
+
+DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider gui/ios_dialog_provider
+
+if ENABLE_MACOSX_UI
+SUBDIRS += gui/macosx
+endif
+if ENABLE_MACOSX_DIALOG_PROVIDER
+SUBDIRS += gui/macosx_dialog_provider
+endif
+if HAVE_IOS
+SUBDIRS += gui/ios_dialog_provider
+endif
+if ENABLE_MINIMAL_MACOSX
+SUBDIRS += gui/minimal_macosx
+endif
+if ENABLE_QT4
+SUBDIRS += gui/qt4
+endif
+if BUILD_SKINS
+SUBDIRS += gui/skins2
+endif
+
+libncurses_plugin_la_SOURCES = gui/ncurses.c
+libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
+libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
+if HAVE_NCURSES
+gui_LTLIBRARIES += libncurses_plugin.la
+endif
+
+EXTRA_DIST += gui/eject.c
diff --git a/modules/gui/minimal_macosx/.gitignore b/modules/gui/minimal_macosx/.gitignore
new file mode 100644
index 0000000..6ccc850
--- /dev/null
+++ b/modules/gui/minimal_macosx/.gitignore
@@ -0,0 +1,32 @@
+guidir = $(pluginsdir)/gui
+gui_LTLIBRARIES =
+
+DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider gui/ios_dialog_provider
+
+if ENABLE_MACOSX_UI
+SUBDIRS += gui/macosx
+endif
+if ENABLE_MACOSX_DIALOG_PROVIDER
+SUBDIRS += gui/macosx_dialog_provider
+endif
+if HAVE_IOS
+SUBDIRS += gui/ios_dialog_provider
+endif
+if ENABLE_MINIMAL_MACOSX
+SUBDIRS += gui/minimal_macosx
+endif
+if ENABLE_QT4
+SUBDIRS += gui/qt4
+endif
+if BUILD_SKINS
+SUBDIRS += gui/skins2
+endif
+
+libncurses_plugin_la_SOURCES = gui/ncurses.c
+libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
+libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
+if HAVE_NCURSES
+gui_LTLIBRARIES += libncurses_plugin.la
+endif
+
+EXTRA_DIST += gui/eject.c
diff --git a/modules/gui/skins2/.gitignore b/modules/gui/skins2/.gitignore
new file mode 100644
index 0000000..6ccc850
--- /dev/null
+++ b/modules/gui/skins2/.gitignore
@@ -0,0 +1,32 @@
+guidir = $(pluginsdir)/gui
+gui_LTLIBRARIES =
+
+DIST_SUBDIRS += gui/macosx gui/minimal_macosx gui/qt4 gui/skins2 gui/macosx_dialog_provider gui/ios_dialog_provider
+
+if ENABLE_MACOSX_UI
+SUBDIRS += gui/macosx
+endif
+if ENABLE_MACOSX_DIALOG_PROVIDER
+SUBDIRS += gui/macosx_dialog_provider
+endif
+if HAVE_IOS
+SUBDIRS += gui/ios_dialog_provider
+endif
+if ENABLE_MINIMAL_MACOSX
+SUBDIRS += gui/minimal_macosx
+endif
+if ENABLE_QT4
+SUBDIRS += gui/qt4
+endif
+if BUILD_SKINS
+SUBDIRS += gui/skins2
+endif
+
+libncurses_plugin_la_SOURCES = gui/ncurses.c
+libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
+libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
+if HAVE_NCURSES
+gui_LTLIBRARIES += libncurses_plugin.la
+endif
+
+EXTRA_DIST += gui/eject.c
More information about the vlc-commits
mailing list