CAS: use the generic dialogs to fetch a text input from the user or to let him/her...

[vlc] / extras / package / npapi.am

diff --git a/extras/package/npapi.am b/extras/package/npapi.am
index 28bc359f048beacbefcf31f87c47b15c10deee9a..6c7bfcdfce085949fcecd5986576a1424da455b8 100644 (file)
--- 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,22 +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)" \
+               MOZILLA_CFLAGS="-I$(abs_builddir)/gecko" \
                SHELL="$(SHELL)" \
-               PKG_CONFIG_LIBDIR="../$(srcdir)/extras/contrib/lib/pkgconfig:../src"
+               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 $@