[vlc-commits] Fetch npapi headers from svn if they are absent of the system

[Rafaël Carré]

npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Dec 19 17:43:22 2012 +0100| [a752d056fa4241cb5ada3bf731a99948511fd15d] | committer: Rafaël Carré

Fetch npapi headers from svn if they are absent of the system

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

 Makefile.am       |    4 ----
 npapi/Makefile.am |   10 +++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ed84255..a661b9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,10 +15,6 @@ if BUILD_ACTIVEX
 SUBDIRS += activex
 endif
 
-npapi-headers:
-	svn export http://npapi-sdk.googlecode.com/svn/trunk/headers gecko -r HEAD
-	touch $@
-
 EXTRA_DIST = \
 	autogen.sh \
 	extras/macosx/Info.plist.in \
diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index 433edf2..5fa3369 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) -I$(top_srcdir)/gecko $(MOZILLA_CFLAGS)
+AM_CPPFLAGS = $(LIBVLC_CFLAGS) -Igecko $(MOZILLA_CFLAGS)
 
 libvlcplugin_la_SOURCES = \
 	common.h \
@@ -50,6 +50,14 @@ if !HAVE_WIN32
 #
 npvlc_LTLIBRARIES = libvlcplugin.la
 
+gecko:
+	svn export http://npapi-sdk.googlecode.com/svn/trunk/headers gecko-svn -r HEAD
+	mv gecko-svn gecko
+
+if FETCH_NPAPI
+$(libvlcplugin_la_OBJECTS): gecko
+endif
+
 AM_CPPFLAGS += -DXP_UNIX -DDATA_PATH=\"$(pkgdatadir)\"
 libvlcplugin_la_LIBADD += $(MOZILLA_LIBS)