X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=4767de00179e074f81a3b6a7eb16535f00cb9582;hb=03d18c98e8576eab70efae9100279861bd657650;hp=c7f4ef79cc8d2649b63131ea9dd035435743a1a2;hpb=0195728baf678ec88a12219595769111125ecd28;p=vlc

diff --git a/Makefile.am b/Makefile.am
index c7f4ef79cc..4767de0017 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,8 @@ NULL =
 #  - modules should come before . because vlc needs the builtins
 #  - . should come before mozilla because the plugin needs libvlc_pic.a
 #  - po should come before . because VLC.app needs the pofiles
-SUBDIRS = intl modules po . mozilla share m4
-DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
+SUBDIRS = intl modules po . mozilla share m4 doc
+DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools
 
 EXTRA_DIST = \
 	HACKING \
@@ -91,11 +91,14 @@ HEADERS_include = \
 	include/video_output.h \
 	include/vlc_block.h \
 	include/vlc_block_helper.h \
+	include/vlc_codec.h \
 	include/vlc_common.h \
 	include/vlc_config.h \
 	include/vlc_cpu.h \
 	include/vlc_error.h \
+	include/vlc_help.h \
 	include/vlc_interface.h \
+	include/vlc_keys.h \
 	include/vlc_messages.h \
 	include/vlc_objects.h \
 	include/vlc_playlist.h \
@@ -251,8 +254,10 @@ if BUILD_GETOPT
 OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
 endif
 if BUILD_MOZILLA
+if !HAVE_WIN32
 LIBRARIES_libvlc_pic = lib/libvlc_pic.a
 endif
+endif
 
 EXTRA_DIST += \
 	$(SOURCES_libvlc_beos) \
@@ -291,6 +296,10 @@ SOURCES_libvlc_common = \
 	src/interface/interface.c \
 	src/interface/intf_eject.c \
 	src/playlist/playlist.c \
+	src/playlist/sort.c \
+	src/playlist/loadsave.c \
+	src/playlist/group.c \
+	src/playlist/item.c \
 	src/input/input.c \
 	src/input/stream.c \
 	src/input/demux.c \
@@ -306,7 +315,6 @@ SOURCES_libvlc_common = \
 	src/video_output/vout_pictures.c \
 	src/video_output/vout_pictures.h \
 	src/video_output/video_text.c \
-	src/video_output/video_text.h \
 	src/video_output/vout_subpictures.c \
 	src/video_output/vout_synchro.c \
 	src/audio_output/common.c \
@@ -445,7 +453,7 @@ VLC.app: vlc
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
-	cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
+	cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
 	cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \
 	      $(top_builddir)/VLC.app
 	rm -Rf $(top_builddir)/tmp
@@ -558,11 +566,19 @@ package-win32-base:
 
 	mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
 	cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ;
+	cp $(srcdir)/share/http/*.css $(srcdir)/vlc-${VERSION}/http/ ;
 	cp $(srcdir)/share/http/admin/*.html \
            $(srcdir)/vlc-${VERSION}/http/admin/ ;
 	cp $(srcdir)/share/http/admin/.access \
            $(srcdir)/vlc-${VERSION}/http/admin/ ;
 
+	mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla"
+if BUILD_MOZILLA
+	cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ;
+	$(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+	cp $(srcdir)/mozilla/vlcintf.xpt  $(srcdir)/vlc-${VERSION}/mozilla/ ;
+endif
+
 package-win32-base-exe:
 # Create package 
 	wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \