[vlc-commits] Fix make dist

[Rafaël Carré]

npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jan  6 00:23:34 2013 +0100| [fb956734f0957cbbb1e1cb9047437fe81760c6de] | committer: Rafaël Carré

Fix make dist

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

 Makefile.am         |   13 ++++++++++++-
 activex/Makefile.am |    7 -------
 npapi/Makefile.am   |    7 ++++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a661b9c..c7625e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,12 +15,23 @@ if BUILD_ACTIVEX
 SUBDIRS += activex
 endif
 
+DISTCHECK_CONFIGURE_FLAGS=--without-gtk
+
 EXTRA_DIST = \
 	autogen.sh \
 	extras/macosx/Info.plist.in \
 	extras/macosx/InstallerInfo.plist.in \
 	extras/macosx/InstallerDescription.plist \
-	extras/macosx/pbdevelopment.plist
+	extras/macosx/pbdevelopment.plist \
+	share/pixmaps/win32/fullscreen.bmp \
+	share/pixmaps/win32/defullscreen.bmp \
+	share/pixmaps/win32/play.bmp \
+	share/pixmaps/win32/pause.bmp \
+	share/pixmaps/win32/volume.bmp \
+	share/pixmaps/win32/volume-muted.bmp \
+	share/test/test.html \
+	share/test/windowless.html \
+	share/test/resize.html
 
 package-macosx-plugin:
 # Create Installer
diff --git a/activex/Makefile.am b/activex/Makefile.am
index f1b6130..d051560 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -18,13 +18,6 @@ DIST_misc = \
     axvlc.tlb \
     inplace.bmp \
     vlc16x16.bmp \
-    ../share/pixmaps/win32/fullscreen.bmp \
-    ../share/pixmaps/win32/defullscreen.bmp \
-    ../share/pixmaps/win32/play.bmp \
-    ../share/pixmaps/win32/pause.bmp \
-    ../share/pixmaps/win32/volume.bmp \
-    ../share/pixmaps/win32/volume-muted.bmp \
-    ../share/test.html \
     $(NULL)
 
 
diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index 5b16024..0d4b146 100644
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -4,7 +4,12 @@
 
 EXTRA_DIST = package/npvlc_rc.rc.in package/npvlc.dll.manifest
 MOSTLYCLEANFILES =
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) \
+	npapi-sdk/npapi.h \
+	npapi-sdk/npfunctions.h \
+	npapi-sdk/npruntime.h \
+	npapi-sdk/nptypes.h
+
 npvlcdir = $(libdir)/mozilla/plugins
 
 AM_CPPFLAGS = $(LIBVLC_CFLAGS) -Inpapi-sdk $(MOZILLA_CFLAGS)