[vlc-commits] Move src to npapi

[Jean-Baptiste Kempf]

npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 10 17:08:40 2011 +0200| [3594b304b396a5e820d1c5df6b7f402d867f39fd] | committer: Jean-Baptiste Kempf

Move src to npapi

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=3594b304b396a5e820d1c5df6b7f402d867f39fd
---

 .gitignore                            |    1 +
 Makefile.am                           |    5 +++--
 configure.ac                          |   14 +++++++-------
 {src => npapi}/.gitignore             |    0
 {src => npapi}/Makefile.am            |    0
 {src => npapi}/control/npolibvlc.cpp  |    0
 {src => npapi}/control/npolibvlc.h    |    0
 {src => npapi}/control/nporuntime.cpp |    0
 {src => npapi}/control/nporuntime.h   |    0
 {src => npapi}/control/position.h     |    0
 {src => npapi}/install.js.in          |    0
 {src => npapi}/install.rdf.in         |    0
 {src => npapi}/manifest.json.in       |    0
 {src => npapi}/npvlc.dll.manifest     |    0
 {src => npapi}/npvlc_rc.rc.in         |    0
 {src => npapi}/support/classinfo.h    |    0
 {src => npapi}/support/npmac.cpp      |    0
 {src => npapi}/support/npunix.cpp     |    0
 {src => npapi}/support/npwin.cpp      |    0
 {src => npapi}/test.html              |    0
 {src => npapi}/vlc.r.in               |    0
 {src => npapi}/vlcplugin.cpp          |    0
 {src => npapi}/vlcplugin.h            |    0
 {src => npapi}/vlcshell.cpp           |    0
 {src => npapi}/vlcshell.h             |    0
 25 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7a85aec..ba1255c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.cache
+*.o
 *.lo
 *.log
 *.la
diff --git a/Makefile.am b/Makefile.am
index 46ea2c7..b1b68ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,9 @@ AUTOMAKE_OPTIONS = \
 	dist-xz \
 	no-dist-gzip
 
-DIST_SUBDIRS= share src
-SUBDIRS = src
+DIST_SUBDIRS= share npapi
+SUBDIRS = npapi
+
 EXTRA_DIST = \
 	autogen.sh \
 	extras/macosx/Info.plist.in \
diff --git a/configure.ac b/configure.ac
index 7c5e63a..e1e5cfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_SUBST(COPYRIGHT_YEARS)
 COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} the VideoLAN team"
 AC_SUBST(COPYRIGHT_MESSAGE)
 
-AC_CONFIG_SRCDIR(src/vlcplugin.cpp)
+AC_CONFIG_SRCDIR(npapi/vlcplugin.cpp)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CANONICAL_BUILD
@@ -209,20 +209,20 @@ AC_LANG_POP(C++)
 
 AC_CONFIG_FILES([
   Makefile
-  src/Makefile
   share/Makefile
-  src/install.js
-  src/install.rdf
-  src/manifest.json
+  npapi/Makefile
+  npapi/install.js
+  npapi/install.rdf
+  npapi/manifest.json
 ])
 AM_COND_IF([HAVE_WIN32], [
   AC_CONFIG_FILES([
-    src/npvlc_rc.rc
+    npapi/npvlc_rc.rc
   ])
 ])
 AM_COND_IF([HAVE_DARWIN], [
   AC_CONFIG_FILES([
-    src/vlc.r
+    npapi/vlc.r
     extras/macosx/Info.plist
     extras/macosx/InstallerInfo.plist
   ])
diff --git a/src/.gitignore b/npapi/.gitignore
similarity index 100%
rename from src/.gitignore
rename to npapi/.gitignore
diff --git a/src/Makefile.am b/npapi/Makefile.am
similarity index 100%
rename from src/Makefile.am
rename to npapi/Makefile.am
diff --git a/src/control/npolibvlc.cpp b/npapi/control/npolibvlc.cpp
similarity index 100%
rename from src/control/npolibvlc.cpp
rename to npapi/control/npolibvlc.cpp
diff --git a/src/control/npolibvlc.h b/npapi/control/npolibvlc.h
similarity index 100%
rename from src/control/npolibvlc.h
rename to npapi/control/npolibvlc.h
diff --git a/src/control/nporuntime.cpp b/npapi/control/nporuntime.cpp
similarity index 100%
rename from src/control/nporuntime.cpp
rename to npapi/control/nporuntime.cpp
diff --git a/src/control/nporuntime.h b/npapi/control/nporuntime.h
similarity index 100%
rename from src/control/nporuntime.h
rename to npapi/control/nporuntime.h
diff --git a/src/control/position.h b/npapi/control/position.h
similarity index 100%
rename from src/control/position.h
rename to npapi/control/position.h
diff --git a/src/install.js.in b/npapi/install.js.in
similarity index 100%
rename from src/install.js.in
rename to npapi/install.js.in
diff --git a/src/install.rdf.in b/npapi/install.rdf.in
similarity index 100%
rename from src/install.rdf.in
rename to npapi/install.rdf.in
diff --git a/src/manifest.json.in b/npapi/manifest.json.in
similarity index 100%
rename from src/manifest.json.in
rename to npapi/manifest.json.in
diff --git a/src/npvlc.dll.manifest b/npapi/npvlc.dll.manifest
similarity index 100%
rename from src/npvlc.dll.manifest
rename to npapi/npvlc.dll.manifest
diff --git a/src/npvlc_rc.rc.in b/npapi/npvlc_rc.rc.in
similarity index 100%
rename from src/npvlc_rc.rc.in
rename to npapi/npvlc_rc.rc.in
diff --git a/src/support/classinfo.h b/npapi/support/classinfo.h
similarity index 100%
rename from src/support/classinfo.h
rename to npapi/support/classinfo.h
diff --git a/src/support/npmac.cpp b/npapi/support/npmac.cpp
similarity index 100%
rename from src/support/npmac.cpp
rename to npapi/support/npmac.cpp
diff --git a/src/support/npunix.cpp b/npapi/support/npunix.cpp
similarity index 100%
rename from src/support/npunix.cpp
rename to npapi/support/npunix.cpp
diff --git a/src/support/npwin.cpp b/npapi/support/npwin.cpp
similarity index 100%
rename from src/support/npwin.cpp
rename to npapi/support/npwin.cpp
diff --git a/src/test.html b/npapi/test.html
similarity index 100%
rename from src/test.html
rename to npapi/test.html
diff --git a/src/vlc.r.in b/npapi/vlc.r.in
similarity index 100%
rename from src/vlc.r.in
rename to npapi/vlc.r.in
diff --git a/src/vlcplugin.cpp b/npapi/vlcplugin.cpp
similarity index 100%
rename from src/vlcplugin.cpp
rename to npapi/vlcplugin.cpp
diff --git a/src/vlcplugin.h b/npapi/vlcplugin.h
similarity index 100%
rename from src/vlcplugin.h
rename to npapi/vlcplugin.h
diff --git a/src/vlcshell.cpp b/npapi/vlcshell.cpp
similarity index 100%
rename from src/vlcshell.cpp
rename to npapi/vlcshell.cpp
diff --git a/src/vlcshell.h b/npapi/vlcshell.h
similarity index 100%
rename from src/vlcshell.h
rename to npapi/vlcshell.h