X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fpackage%2Fnpapi.am;h=6c7bfcdfce085949fcecd5986576a1424da455b8;hb=8d95ee611103aac69b118f4845197144b2e68c8b;hp=d8600e8d51ac2cbda8ffd8ff1453e864598ff77d;hpb=698853e41d9689751ae298f2a1bf16264ac94c40;p=vlc

diff --git a/extras/package/npapi.am b/extras/package/npapi.am
index d8600e8d51..6c7bfcdfce 100644
--- a/extras/package/npapi.am
+++ b/extras/package/npapi.am
@@ -1,11 +1,10 @@
 #! /usr/bin/make -f
 
-if HAVE_WIN64
-build-npapi:
-	touch $@
-else
 build-npapi: stamp-npapi-build
-endif
+
+stamp-gecko-fetch:
+	svn export http://npapi-sdk.googlecode.com/svn/trunk/headers gecko -r HEAD
+	touch $@
 
 stamp-npapi-fetch:
 	rm -Rf npapi-vlc
@@ -18,21 +17,22 @@ stamp-npapi-autogen: stamp-npapi-fetch
 	$(SHELL) ./autogen.sh
 	touch $@
 
-stamp-npapi-configure: stamp-npapi-autogen
+stamp-npapi-configure: stamp-npapi-autogen stamp-gecko-fetch
 	cd npapi-vlc && \
 	$(SHELL) ./configure \
 		--prefix=/ \
 		--host=$(host_alias) --build=$(build_alias) \
-		--with-mozilla-sdk-path="$(CONTRIB_DIR)/gecko-sdk" \
 		CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" \
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
 		LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
-		PKG_CONFIG_LIBDIR="../$(srcdir)/extras/contrib/lib/pkgconfig:../src"
+		MOZILLA_CFLAGS="-I$(abs_builddir)/gecko" \
+		SHELL="$(SHELL)" \
+		PKG_CONFIG_LIBDIR="../$(srcdir)/extras/contrib/lib/pkgconfig:../lib"
 	touch $@
 
 stamp-npapi-build: stamp-npapi-configure
 	cd npapi-vlc && \
-	$(MAKE) $(MAKEFLAGS) all && \
-	$(MAKE) $(MAKEFLAGS) DESTDIR="$(abs_builddir)/npapi-vlc/installed" install
+	$(MAKE) all && \
+	$(MAKE) DESTDIR="$(abs_builddir)/npapi-vlc/installed" install
 	touch $@