[vlc-commits] Move notify/ out of misc/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug  4 15:17:54 2011 +0300| [55596c9081184e38cdf6f19f0bccae9df0925ea2] | committer: Rémi Denis-Courmont

Move notify/ out of misc/

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

 configure.ac                          |    2 +-
 modules/Makefile.am                   |    1 +
 modules/misc/Modules.am               |    2 +-
 modules/notify/.gitignore             |    1 +
 modules/{misc => }/notify/Modules.am  |    0
 modules/{misc => }/notify/growl.m     |    0
 modules/{misc => }/notify/growl_udp.c |    0
 modules/{misc => }/notify/msn.c       |    0
 modules/{misc => }/notify/notify.c    |    0
 modules/{misc => }/notify/telepathy.c |    0
 modules/{misc => }/notify/xosd.c      |    0
 po/POTFILES.in                        |   12 ++++++------
 12 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index f2b777f..0dd1565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4399,13 +4399,13 @@ AC_CONFIG_FILES([
   modules/lua/Makefile
   modules/meta_engine/Makefile
   modules/misc/Makefile
-  modules/misc/notify/Makefile
   modules/misc/playlist/Makefile
   modules/misc/osd/Makefile
   modules/misc/stats/Makefile
   modules/media_library/Makefile
   modules/mux/Makefile
   modules/mux/mpeg/Makefile
+  modules/notify/Makefile
   modules/packetizer/Makefile
   modules/services_discovery/Makefile
   modules/stream_filter/Makefile
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 3e8549b..f739ecc 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -11,6 +11,7 @@ BASE_SUBDIRS = \
 	meta_engine \
 	misc \
 	media_library \
+	notify \
 	packetizer \
 	services_discovery \
 	stream_filter \
diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index a1c28a5..ead1a8c 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,4 +1,4 @@
-BASE_SUBDIRS = notify playlist stats osd
+BASE_SUBDIRS = playlist stats osd
 
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS)
diff --git a/modules/notify/.gitignore b/modules/notify/.gitignore
new file mode 100644
index 0000000..08a6d72
--- /dev/null
+++ b/modules/notify/.gitignore
@@ -0,0 +1 @@
+Makefile.am
diff --git a/modules/misc/notify/Modules.am b/modules/notify/Modules.am
similarity index 100%
rename from modules/misc/notify/Modules.am
rename to modules/notify/Modules.am
diff --git a/modules/misc/notify/growl.m b/modules/notify/growl.m
similarity index 100%
rename from modules/misc/notify/growl.m
rename to modules/notify/growl.m
diff --git a/modules/misc/notify/growl_udp.c b/modules/notify/growl_udp.c
similarity index 100%
rename from modules/misc/notify/growl_udp.c
rename to modules/notify/growl_udp.c
diff --git a/modules/misc/notify/msn.c b/modules/notify/msn.c
similarity index 100%
rename from modules/misc/notify/msn.c
rename to modules/notify/msn.c
diff --git a/modules/misc/notify/notify.c b/modules/notify/notify.c
similarity index 100%
rename from modules/misc/notify/notify.c
rename to modules/notify/notify.c
diff --git a/modules/misc/notify/telepathy.c b/modules/notify/telepathy.c
similarity index 100%
rename from modules/misc/notify/telepathy.c
rename to modules/notify/telepathy.c
diff --git a/modules/misc/notify/xosd.c b/modules/notify/xosd.c
similarity index 100%
rename from modules/misc/notify/xosd.c
rename to modules/notify/xosd.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 97f6c0b..6cef412 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -918,12 +918,6 @@ modules/misc/inhibit/xdg.c
 modules/misc/inhibit/xscreensaver.c
 modules/misc/logger.c
 modules/misc/memcpy.c
-modules/misc/notify/growl.m
-modules/misc/notify/growl_udp.c
-modules/misc/notify/msn.c
-modules/misc/notify/notify.c
-modules/misc/notify/telepathy.c
-modules/misc/notify/xosd.c
 modules/misc/osd/osd_menu.c
 modules/misc/osd/osd_menu.h
 modules/misc/osd/parser.c
@@ -957,6 +951,12 @@ modules/mux/mpeg/ts.c
 modules/mux/mpjpeg.c
 modules/mux/ogg.c
 modules/mux/wav.c
+modules/notify/growl.m
+modules/notify/growl_udp.c
+modules/notify/msn.c
+modules/notify/notify.c
+modules/notify/telepathy.c
+modules/notify/xosd.c
 modules/packetizer/copy.c
 modules/packetizer/dirac.c
 modules/packetizer/flac.c