[vlc-commits] Rename gecko to npapi-sdk

[Jean-Baptiste Kempf]

npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Dec 27 18:08:21 2012 +0100| [304cd57ce062ec64ef3224abe426520a591110f7] | committer: Jean-Baptiste Kempf

Rename gecko to npapi-sdk

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

 configure.ac               |    2 +-
 extras/macosx/build-vlc.sh |    4 ++--
 npapi/.gitignore           |    2 +-
 npapi/Makefile.am          |   14 +++++++-------
 npapi/vlcshell.cpp         |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index bd172dd..3ba5548 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,7 +189,7 @@ dnl we can't use the pkg-config macros.
   done
 
 CPPFLAGS_save="${CPPFLAGS}"
-CPPFLAGS="${CPPFLAGS} ${MOZILLA_CFLAGS} -Igecko/"
+CPPFLAGS="${CPPFLAGS} ${MOZILLA_CFLAGS} -Inpapi-sdk/"
 
 AC_CHECK_HEADERS(npapi.h npruntime.h, [
     dnl if found
diff --git a/extras/macosx/build-vlc.sh b/extras/macosx/build-vlc.sh
index 5d3e9fa..5a2e64a 100755
--- a/extras/macosx/build-vlc.sh
+++ b/extras/macosx/build-vlc.sh
@@ -69,8 +69,8 @@ info $npapi_root_dir
 
 info "Preparing build dirs"
 
-if ! [ -e gecko ]; then
-svn export http://npapi-sdk.googlecode.com/svn/trunk/headers gecko -r HEAD
+if ! [ -e npapi-sdk ]; then
+svn export http://npapi-sdk.googlecode.com/svn/trunk/headers npapi-sdk -r HEAD
 fi
 
 spushd extras/macosx
diff --git a/npapi/.gitignore b/npapi/.gitignore
index e14e7d1..e481cb6 100644
--- a/npapi/.gitignore
+++ b/npapi/.gitignore
@@ -3,4 +3,4 @@ npvlc_rc.rc
 vlc.r
 install.rdf
 manifest.json
-gecko/
+npapi-sdk/
diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index 1cfb732..a96df6d 100644
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -7,7 +7,7 @@ MOSTLYCLEANFILES =
 CLEANFILES = $(BUILT_SOURCES)
 npvlcdir = $(libdir)/mozilla/plugins
 
-AM_CPPFLAGS = $(LIBVLC_CFLAGS) -Igecko $(MOZILLA_CFLAGS)
+AM_CPPFLAGS = $(LIBVLC_CFLAGS) -Inpapi-sdk $(MOZILLA_CFLAGS)
 
 libvlcplugin_la_SOURCES = \
 	common.h \
@@ -43,9 +43,9 @@ npvlc_la_DEPENDENCIES = $(libvlcplugin_la_DEPENDENCIES)
 npvlc_la_LIBADD = $(libvlcplugin_la_LIBADD)
 npvlc_la_LDFLAGS = $(libvlcplugin_la_LDFLAGS)
 
-gecko:
-	svn export http://npapi-sdk.googlecode.com/svn/trunk/headers gecko-svn -r HEAD
-	mv gecko-svn gecko
+npapi-sdk:
+	svn export http://npapi-sdk.googlecode.com/svn/trunk/headers npapi-sdk-svn -r HEAD
+	mv npapi-sdk-svn npapi-sdk
 
 if !HAVE_DARWIN
 if !HAVE_WIN32
@@ -55,7 +55,7 @@ if !HAVE_WIN32
 npvlc_LTLIBRARIES = libvlcplugin.la
 
 if FETCH_NPAPI
-$(libvlcplugin_la_OBJECTS): gecko
+$(libvlcplugin_la_OBJECTS): npapi-sdk
 endif
 
 AM_CPPFLAGS += -DXP_UNIX -DDATA_PATH=\"$(pkgdatadir)\"
@@ -94,7 +94,7 @@ else # Win32
 lib_LTLIBRARIES = npvlc.la
 
 if FETCH_NPAPI
-$(npvlc_la_OBJECTS): gecko
+$(npvlc_la_OBJECTS): npapi-sdk
 endif
 
 AM_CPPFLAGS += -DXP_WIN -DXP_WIN32 \
@@ -122,7 +122,7 @@ endif
 else
 
 if FETCH_NPAPI
-$(npvlc_la_OBJECTS): gecko
+$(npvlc_la_OBJECTS): npapi-sdk
 endif
 
 # MacOS X
diff --git a/npapi/vlcshell.cpp b/npapi/vlcshell.cpp
index 687e5c9..dc73a44 100644
--- a/npapi/vlcshell.cpp
+++ b/npapi/vlcshell.cpp
@@ -180,7 +180,7 @@ NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value )
 }
 
 /*
- * there is some confusion in gecko headers regarding definition of this API
+ * there is some confusion in NPAPI headers regarding definition of this API
  * NPPVariable is wrongly defined as NPNVariable, which sounds incorrect.
  */