Move src to npapi

rdp · Jul 10, 2011 · 3594b30 · 3594b30
1 parent 809830a
commit 3594b30
Show file tree

Hide file tree

Showing 25 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.cache
+*.o
 *.lo
 *.log
 *.la

diff --git 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
@@ -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 → npapi/.gitignore b/src/.gitignore → npapi/.gitignore
diff --git a/src/Makefile.am → npapi/Makefile.am b/src/Makefile.am → npapi/Makefile.am
diff --git a/src/control/npolibvlc.cpp → npapi/control/npolibvlc.cpp b/src/control/npolibvlc.cpp → npapi/control/npolibvlc.cpp
diff --git a/src/control/npolibvlc.h → npapi/control/npolibvlc.h b/src/control/npolibvlc.h → npapi/control/npolibvlc.h
diff --git a/src/control/nporuntime.cpp → npapi/control/nporuntime.cpp b/src/control/nporuntime.cpp → npapi/control/nporuntime.cpp
diff --git a/src/control/nporuntime.h → npapi/control/nporuntime.h b/src/control/nporuntime.h → npapi/control/nporuntime.h
diff --git a/src/control/position.h → npapi/control/position.h b/src/control/position.h → npapi/control/position.h
diff --git a/src/install.js.in → npapi/install.js.in b/src/install.js.in → npapi/install.js.in
diff --git a/src/install.rdf.in → npapi/install.rdf.in b/src/install.rdf.in → npapi/install.rdf.in
diff --git a/src/manifest.json.in → npapi/manifest.json.in b/src/manifest.json.in → npapi/manifest.json.in
diff --git a/src/npvlc.dll.manifest → npapi/npvlc.dll.manifest b/src/npvlc.dll.manifest → npapi/npvlc.dll.manifest
diff --git a/src/npvlc_rc.rc.in → npapi/npvlc_rc.rc.in b/src/npvlc_rc.rc.in → npapi/npvlc_rc.rc.in
diff --git a/src/support/classinfo.h → npapi/support/classinfo.h b/src/support/classinfo.h → npapi/support/classinfo.h
diff --git a/src/support/npmac.cpp → npapi/support/npmac.cpp b/src/support/npmac.cpp → npapi/support/npmac.cpp
diff --git a/src/support/npunix.cpp → npapi/support/npunix.cpp b/src/support/npunix.cpp → npapi/support/npunix.cpp
diff --git a/src/support/npwin.cpp → npapi/support/npwin.cpp b/src/support/npwin.cpp → npapi/support/npwin.cpp
diff --git a/src/test.html → npapi/test.html b/src/test.html → npapi/test.html
diff --git a/src/vlc.r.in → npapi/vlc.r.in b/src/vlc.r.in → npapi/vlc.r.in
diff --git a/src/vlcplugin.cpp → npapi/vlcplugin.cpp b/src/vlcplugin.cpp → npapi/vlcplugin.cpp
diff --git a/src/vlcplugin.h → npapi/vlcplugin.h b/src/vlcplugin.h → npapi/vlcplugin.h
diff --git a/src/vlcshell.cpp → npapi/vlcshell.cpp b/src/vlcshell.cpp → npapi/vlcshell.cpp
diff --git a/src/vlcshell.h → npapi/vlcshell.h b/src/vlcshell.h → npapi/vlcshell.h